Patchwork D2463: wireprotoserver: support logging SSH server I/O to a file descriptor

login
register
mail settings
Submitter phabricator
Date March 1, 2018, 9:30 p.m.
Message ID <f369bdbec9c810a1938f403ab598ece0@localhost.localdomain>
Download mbox | patch
Permalink /patch/28595/
State Not Applicable
Headers show

Comments

phabricator - March 1, 2018, 9:30 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG64efadb62026: wireprotoserver: support logging SSH server I/O to a file descriptor (authored by indygreg, committed by ).

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D2463?vs=6248&id=6281#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2463?vs=6248&id=6281

REVISION DETAIL
  https://phab.mercurial-scm.org/D2463

AFFECTED FILES
  mercurial/wireprotoserver.py

CHANGE DETAILS




To: indygreg, #hg-reviewers, durin42
Cc: mercurial-devel

Patch

diff --git a/mercurial/wireprotoserver.py b/mercurial/wireprotoserver.py
--- a/mercurial/wireprotoserver.py
+++ b/mercurial/wireprotoserver.py
@@ -588,12 +588,19 @@ 
                                          state)
 
 class sshserver(object):
-    def __init__(self, ui, repo):
+    def __init__(self, ui, repo, logfh=None):
         self._ui = ui
         self._repo = repo
         self._fin = ui.fin
         self._fout = ui.fout
 
+        # Log write I/O to stdout and stderr if configured.
+        if logfh:
+            self._fout = util.makeloggingfileobject(
+                logfh, self._fout, 'o', logdata=True)
+            ui.ferr = util.makeloggingfileobject(
+                logfh, ui.ferr, 'e', logdata=True)
+
         hook.redirect(True)
         ui.fout = repo.ui.fout = ui.ferr