mercurial-scm/hg: comparison mercurial/commandserver.py

equal deleted inserted replaced

-:82210d88d814
+:eaabcb689747
 from .utils import (
 cborutil,
 procutil,
 )
-logfile = None
-def log(*args):
-if not logfile:
-return
-for a in args:
-logfile.write(str(a))
-logfile.flush()
 class channeledoutput(object):
 """
 Write data to out in the following format:
 data length (unsigned int),
 based stream to fout.
 """
 def __init__(self, ui, repo, fin, fout):
 self.cwd = encoding.getcwd()
-if ui.config("cmdserver", "log") == '-':
-global logfile
-# switch log stream to the 'd' (debug) channel
-logfile = channeledoutput(fout, 'd')
 if repo:
 # the ui here is really the repo ui so take its baseui so we don't
 # end up with its local configuration
 self.ui = repo.baseui
 self.repo = repo
 self.repoui = repo.ui
 else:
 self.ui = ui
 self.repo = self.repoui = None
-self.cdebug = logfile
+self.cdebug = channeledoutput(fout, 'd')
 self.cerr = channeledoutput(fout, 'e')
 self.cout = channeledoutput(fout, 'o')
 self.cin = channeledinput(fin, fout, 'I')
 self.cresult = channeledoutput(fout, 'r')
 """
 # developer config: cmdserver.log
 logpath = ui.config(b'cmdserver', b'log')
 if not logpath:
 return
-tracked = {b'cmdserver'}
+tracked = {b'chgserver', b'cmdserver'}
-global logfile
-if logpath == b'-':
-logfile = ui.ferr
-else:
-logfile = open(logpath, 'ab')
 if logpath == b'-' and fp:
 logger = loggingutil.fileobjectlogger(fp, tracked)
 elif logpath == b'-':
 logger = loggingutil.fileobjectlogger(ui.ferr, tracked)