Skip to content
Permalink
Browse files

Don't relog child output

  • Loading branch information
wsanchez committed Jan 4, 2014
1 parent ef66b48 commit 9d026aff068dce794d8635a1910b59d1fcae7799
Showing with 18 additions and 3 deletions.
  1. +18 −3 twext/application/masterchild.py
@@ -488,7 +488,8 @@ class ChildProcessProtocol(ProcessProtocol, object):
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 __init__(self, service, inheritedSocket):


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 @@ def createTransport(self, socket, peer, data, protocol):


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("-")

0 comments on commit 9d026af

Please sign in to comment.
You can’t perform that action at this time.