Logging stderr to log file now

Tribler · Mar 9, 2018 · 8176a24 · 8176a24
1 parent a91b1a4
commit 8176a24
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/scripts/dispersy-tracker@.service b/scripts/dispersy-tracker@.service
@@ -9,7 +9,7 @@ Environment="PYTHONPATH=/opt/dispersy"
 WorkingDirectory=/opt
 
 ExecStartPre=/bin/mkdir -p ${HOME}/%i
-ExecStart=/usr/bin/twistd --nodaemon --pidfile= tracker --port=%i --statedir=${HOME}/%i
+ExecStart=/usr/bin/twistd --nodaemon --pidfile= tracker --port=%i --statedir=${HOME}/%i --loglevel ${TRACKER_LOGLEVEL}
 
 User=dispersy_tracker
 Group=dispersy_tracker

diff --git a/twisted/plugins/tracker_plugin.py b/twisted/plugins/tracker_plugin.py
@@ -22,8 +22,10 @@
 import os
 import signal
 import sys
+from logging.handlers import RotatingFileHandler
 from time import time
 
+import logging
 from twisted.application.service import IServiceMaker, MultiService
 from twisted.conch import manhole_tap
 from twisted.internet import reactor
@@ -170,24 +172,10 @@ class Options(usage.Options):
         ["crypto"  , "c", "ECCrypto",     "The Crypto object type Dispersy is going to use"              , str],
         ["manhole" , "m", 0         ,     "Enable manhole telnet service listening at the specified port", int],
         ["logfile" , "l", "dispersy.log", "Use an alternate dispersy log file name",                       str],
+        ["loglevel", "v", "DEBUG",        "Set the logging level (DEBUG, INFO, WARN, ERROR)"             , str]
     ]
 
 
-class TrackerMultiService(MultiService):
-
-    def __init__(self, log_file, log_dir):
-        MultiService.__init__(self)
-        self.log_file = log_file
-        self.log_dir = log_dir
-
-    def setServiceParent(self, parent):
-        MultiService.setServiceParent(self, parent)
-        # user daily logging
-        log_file = DailyLogFile(self.log_file, self.log_dir)
-        logger = FileLogObserver(log_file)
-        parent.setComponent(ILogObserver, logger.emit)
-
-
 class TrackerServiceMaker(object):
     implements(IServiceMaker, IPlugin)
     tapname = "tracker"
@@ -198,7 +186,7 @@ def makeService(self, options):
         """
         Construct a dispersy service.
         """
-        tracker_service = TrackerMultiService(options["logfile"], options["statedir"])
+        tracker_service = MultiService()
         tracker_service.setName("Dispersy Tracker")
 
         # crypto
@@ -221,6 +209,16 @@ def makeService(self, options):
             manhole.startService()
 
         def run():
+            # Setup logging
+            print "Using logging level: %s" % options["loglevel"]
+            log_level = getattr(logging, options["loglevel"])
+
+            root = logging.getLogger()
+            root.setLevel(log_level)
+            handler = RotatingFileHandler(os.path.join(options["statedir"], options["logfile"]),
+                                          maxBytes=1024 * 1024 * 100, backupCount=10)
+            root.addHandler(handler)
+
             # setup
             dispersy = TrackerDispersy(StandaloneEndpoint(options["port"],
                                                           options["ip"]),