[CalendarServer-changes] [12239] twext/trunk/twext/application/masterchild.py

[source_changes at macosforge.org]

Revision: 12239
          http://trac.calendarserver.org//changeset/12239
Author:   wsanchez at apple.com
Date:     2014-01-03 17:04:39 -0800 (Fri, 03 Jan 2014)
Log Message:
-----------
Don't relog child output

Modified Paths:
--------------
    twext/trunk/twext/application/masterchild.py

Modified: twext/trunk/twext/application/masterchild.py
===================================================================
--- twext/trunk/twext/application/masterchild.py	2014-01-04 00:36:39 UTC (rev 12238)
+++ twext/trunk/twext/application/masterchild.py	2014-01-04 01:04:39 UTC (rev 12239)
@@ -488,7 +488,8 @@
     Process protocol for child processes.
     """
 
-    log = Logger()
+    # FIXME: deserialize log events from child
+    # log = Logger()
 
 
     def __init__(self, service, inheritedSocket):
@@ -497,12 +498,14 @@
 
 
     def outReceived(self, data):
-        self.log.info(u"{data}", data=data)
+        # self.log.info(u"{data}", data=data)
+        sys.stdout.write(data)
 
 
     def errReceived(self, data):
         super(ChildProcessProtocol, self).errReceived(data)
-        self.log.error(u"{data}", data=data)
+        # self.log.error(u"{data}", data=data)
+        sys.stderr.write(data)
 
 
     def processExited(self, reason):
@@ -632,6 +635,18 @@
 
 
 class ReportingProtocolWrapper(ProtocolWrapper, object):
+    # def __init__(self, *args, **kwargs):
+    #     try:
+    #         raise RuntimeError()
+    #     except RuntimeError:
+    #         from twisted.python.failure import Failure
+    #         f = Failure()
+    #         f.printTraceback()
+    #     return super(ReportingProtocolWrapper, self).__init__(
+    #         *args, **kwargs
+    #     )
+
+
     def connectionLost(self, reason):
         # self.factory.protocolDidLoseConnection(self)
         self.factory.inheritedPort.reportStatus("-")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/8c31027c/attachment.html>