From: Brian Warner <warner@allmydata.com>
Date: Fri, 12 Oct 2007 00:30:07 +0000 (-0700)
Subject: node.py: fix timestamps (add ms and Z) by replacing the FileLogObserver. #171.
X-Git-Tag: allmydata-tahoe-0.6.1~28
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=654bbbed8fdab88c77e79fc1240d6f7d6a037f21;p=tahoe-lafs%2Ftahoe-lafs.git

node.py: fix timestamps (add ms and Z) by replacing the FileLogObserver. #171.
---

diff --git a/src/allmydata/node.py b/src/allmydata/node.py
index c1d0b4ff..5e4c5e2e 100644
--- a/src/allmydata/node.py
+++ b/src/allmydata/node.py
@@ -1,13 +1,13 @@
 
-import os.path, re
+import os.path, re, time
 from base64 import b32decode, b32encode
 
 import twisted
-from twisted.python import log
+from twisted.python import log, logfile
 from twisted.application import service
 from twisted.internet import defer, reactor
 from foolscap import Tub, eventual
-from allmydata.util import iputil, observer, humanreadable
+from allmydata.util import iputil, observer, humanreadable, fileutil
 from allmydata.util.assertutil import precondition
 
 # Just to get their versions:
@@ -18,6 +18,19 @@ import foolscap
 # group 1 will be addr (dotted quad string), group 3 if any will be portnum (string)
 ADDR_RE=re.compile("^([1-9][0-9]*\.[1-9][0-9]*\.[1-9][0-9]*\.[1-9][0-9]*)(:([1-9][0-9]*))?$")
 
+
+
+class MyFileLogObserver(log.FileLogObserver):
+    def formatTime(self, when):
+        # we want UTC timestamps that look like:
+        #  2007-10-12 00:26:28.566Z [Client] rnp752lz: 'client running'
+        base = time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(when))
+        # now add the milliseconds
+        fraction = when - int(when)
+        suffix = ".%03dZ" % (1000*fraction,)
+        return base + suffix
+
+
 class Node(service.MultiService):
     # this implements common functionality of both Client nodes, Introducer 
     # nodes, and Vdrive nodes
@@ -61,6 +74,7 @@ class Node(service.MultiService):
                 m.setServiceParent(self)
                 self.log("AuthorizedKeysManhole listening on %d" % portnum)
 
+        self.setup_logging()
         self.log("Node constructed.  tahoe version: %s, foolscap: %s,"
                  " twisted: %s, zfec: %s"
                  % (allmydata.__version__, foolscap.__version__,
@@ -165,11 +179,30 @@ class Node(service.MultiService):
         self.log("Node.shutdown")
         return self.stopService()
 
+    def setup_logging(self):
+        # we replace the log observer that twistd set up for us, with a form
+        # that uses better timestamps. First, shut down all existing
+        # file-based observers (leaving trial's error-watching observers in
+        # place).
+        for o in log.theLogPublisher.observers:
+            # o might be a FileLogObserver's .emit method
+            if type(o) is type(self.setup_logging): # bound method
+                ob = o.im_self
+                if isinstance(ob, log.FileLogObserver):
+                    log.removeObserver(o)
+        logdir = os.path.abspath(os.path.join(self.basedir, "logs"))
+        fileutil.make_dirs(logdir)
+        lf = logfile.LogFile("twistd.log", logdir)
+        # TODO: twisted >2.5.0 offers maxRotatedFiles=50
+        ob = MyFileLogObserver(lf)
+        log.addObserver(ob.emit)
+        return
+
     def log(self, msg, src="", args=()):
         if src:
             logsrc = src
         else:
-            logsrc=self.logSource
+            logsrc = self.logSource
         if args:
             try:
                 msg = msg % tuple(map(humanreadable.hr, args))
@@ -178,8 +211,10 @@ class Node(service.MultiService):
         # TODO: modify the timestamp to include milliseconds
         # TODO: modify it to be in UTC instead of localtime
         #  (see twisted/python/log.py:FileLogObserver.formatTime line 362)
-        log.FileLogObserver.timeFormat="%Y-%m-%d %H:%M:%S"
-        log.callWithContext({"system":logsrc},log.msg,(self.short_nodeid + ": " + humanreadable.hr(msg)))
+
+        log.callWithContext({"system":logsrc},
+                            log.msg,
+                            (self.short_nodeid + ": " + humanreadable.hr(msg)))
 
     def _setup_tub(self, local_addresses):
         # we can't get a dynamically-assigned portnum until our Tub is