[CalendarServer-changes] [15395] CalendarServer/trunk/calendarserver/tools/cmdline.py

source_changes at macosforge.org source_changes at macosforge.org
Tue Dec 15 07:40:57 PST 2015


Revision: 15395
          http://trac.calendarserver.org//changeset/15395
Author:   cdaboo at apple.com
Date:     2015-12-15 07:40:57 -0800 (Tue, 15 Dec 2015)
Log Message:
-----------
Fix cmdline tool -D option.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/cmdline.py

Modified: CalendarServer/trunk/calendarserver/tools/cmdline.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/cmdline.py	2015-12-15 14:56:21 UTC (rev 15394)
+++ CalendarServer/trunk/calendarserver/tools/cmdline.py	2015-12-15 15:40:57 UTC (rev 15395)
@@ -86,9 +86,9 @@
         return service
 
     # Install std i/o observer
+    observers = []
     if verbose:
-        observer = STDLibLogObserver()
-        observer.start()
+        observers.append(STDLibLogObserver())
 
     if reactor is None:
         from twisted.internet import reactor
@@ -106,7 +106,8 @@
         )
         utilityLogObserver = FileLogObserver(utilityLogFile, lambda event: formatEventAsClassicLogText(event))
         utilityLogObserver._encoding = "utf-8"
-        Logger.beginLoggingTo([utilityLogObserver, ], redirectStandardIO=False)
+        observers.append(utilityLogObserver)
+        Logger.beginLoggingTo(observers, redirectStandardIO=False)
 
         config.ProcessType = "Utility"
         config.UtilityServiceClass = _makeValidService
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20151215/a7e76b56/attachment-0001.html>


More information about the calendarserver-changes mailing list