r47010 - make twistd use the new logger

Author: hawkowl
Date: Thu Mar 17 09:49:12 2016
New Revision: 47010

Modified:
   branches/tlogger-twistd-8235/twisted/application/app.py
   branches/tlogger-twistd-8235/twisted/internet/protocol.py
   branches/tlogger-twistd-8235/twisted/logger/__init__.py
   branches/tlogger-twistd-8235/twisted/scripts/_twistd_unix.py

Log:
make twistd use the new logger

Modified: branches/tlogger-twistd-8235/twisted/application/app.py
==============================================================================
--- branches/tlogger-twistd-8235/twisted/application/app.py	(original)
+++ branches/tlogger-twistd-8235/twisted/application/app.py	Thu Mar 17 09:49:12 2016
@@ -17,8 +17,9 @@
 from twisted.application import service, reactors
 from twisted.internet import defer
 from twisted.persisted import sob
+from twisted.logger import _logFor, ILogObserver
 from twisted.python import runtime, log, usage, failure, util, logfile
-from twisted.python.log import ILogObserver
+from twisted.python.log import ILogObserver as LegacyILogObserver
 from twisted.python.reflect import qual, namedAny
 
 # Expose the new implementation of installReactor at the old location.
@@ -180,12 +181,20 @@
         if self._observerFactory is not None:
             observer = self._observerFactory()
         else:
-            observer = application.getComponent(ILogObserver, None)
+            observer = application.getComponent(LegacyILogObserver, None)
 
         if observer is None:
             observer = self._getLogObserver()
         self._observer = observer
-        log.startLoggingWithObserver(self._observer)
+
+        from twisted.logger import globalLogBeginner, LegacyLogObserverWrapper
+
+        if ILogObserver.providedBy(self._observer):
+            observers = [self._observer]
+        else:
+            observers = [LegacyLogObserverWrapper(self._observer)]
+
+        globalLogBeginner.beginLoggingTo(observers)
         self._initialLog()
 
 
@@ -194,10 +203,11 @@
         Print twistd start log message.
         """
         from twisted.internet import reactor
-        log.msg("twistd %s (%s %s) starting up." % (
-            copyright.version, sys.executable, runtime.shortPythonVersion())
-        )
-        log.msg('reactor class: %s.' % (qual(reactor.__class__),))
+        _logFor(self).info("twistd {version} ({exe} {pyVersion}) starting up.",
+            version=copyright.version, exe=sys.executable,
+                           pyVersion=runtime.shortPythonVersion())
+        _logFor(self).info('reactor class: {reactor}.',
+                           reactor=qual(reactor.__class__))
 
 
     def _getLogObserver(self):

Modified: branches/tlogger-twistd-8235/twisted/internet/protocol.py
==============================================================================
--- branches/tlogger-twistd-8235/twisted/internet/protocol.py	(original)
+++ branches/tlogger-twistd-8235/twisted/internet/protocol.py	Thu Mar 17 09:49:12 2016
@@ -16,11 +16,7 @@
 
 from twisted.python import log, failure, components
 from twisted.internet import interfaces, error, defer
-from twisted.logger import Logger
-
-_log = Logger()
-_logFor = lambda _:_log.__get__(_, _.__class__)
-
+from twisted.logger import _logFor
 
 
 @implementer(interfaces.IProtocolFactory, interfaces.ILoggingContext)

Modified: branches/tlogger-twistd-8235/twisted/logger/__init__.py
==============================================================================
--- branches/tlogger-twistd-8235/twisted/logger/__init__.py	(original)
+++ branches/tlogger-twistd-8235/twisted/logger/__init__.py	Thu Mar 17 09:49:12 2016
@@ -121,3 +121,6 @@
     eventAsJSON, eventFromJSON,
     jsonFileLogObserver, eventsFromJSONLogFile
 )
+
+_log = Logger()
+_logFor = lambda _:_log.__get__(_, _.__class__)

Modified: branches/tlogger-twistd-8235/twisted/scripts/_twistd_unix.py
==============================================================================
--- branches/tlogger-twistd-8235/twisted/scripts/_twistd_unix.py	(original)
+++ branches/tlogger-twistd-8235/twisted/scripts/_twistd_unix.py	Thu Mar 17 09:49:12 2016
@@ -146,6 +146,8 @@
             from twisted.python import syslog
             return syslog.SyslogObserver(self._syslogPrefix).emit
 
+        from twisted.logger import textFileLogObserver
+
         if self._logfilename == '-':
             if not self._nodaemon:
                 sys.exit('Daemons cannot log to stdout, exiting!')
@@ -167,7 +169,7 @@
                         from twisted.internet import reactor
                         reactor.callFromThread(logFile.rotate)
                     signal.signal(signal.SIGUSR1, rotateLog)
-        return log.FileLogObserver(logFile).emit
+        return textFileLogObserver(logFile)