From: Brian Warner <warner@allmydata.com>
Date: Tue, 15 Jan 2008 04:16:58 +0000 (-0700)
Subject: logging: enable flogging in more places, replace Node.log with flogging
X-Git-Url: https://git.rkrishnan.org/provisioning?a=commitdiff_plain;h=cb76ed36f95ece1e3c5a52ad17e055455f75503e;p=tahoe-lafs%2Ftahoe-lafs.git

logging: enable flogging in more places, replace Node.log with flogging
---

diff --git a/src/allmydata/node.py b/src/allmydata/node.py
index 0d82777b..244a1e1d 100644
--- a/src/allmydata/node.py
+++ b/src/allmydata/node.py
@@ -208,7 +208,10 @@ class Node(service.MultiService):
                            os.path.join(self.basedir, "log_gatherer.furl"))
         self.tub.setOption("bridge-twisted-logs", True)
 
-    def log(self, msg, src="", args=(), **kw):
+    def log(self, *args, **kwargs):
+        return tahoe_log.msg(*args, **kwargs)
+
+    def old_log(self, msg, src="", args=(), **kw):
         if src:
             logsrc = src
         else:
diff --git a/src/allmydata/test/test_helper.py b/src/allmydata/test/test_helper.py
index 6f7217a6..cb5e707b 100644
--- a/src/allmydata/test/test_helper.py
+++ b/src/allmydata/test/test_helper.py
@@ -24,8 +24,8 @@ class CHKUploadHelper_already_uploaded(offloaded.CHKUploadHelper):
         return (res, None)
 
 class FakeClient(service.MultiService):
-    def log(self, msg, **kwargs):
-        return log.msg(msg, **kwargs)
+    def log(self, *args, **kwargs):
+        return log.msg(*args, **kwargs)
     def get_push_to_ourselves(self):
         return True
     def get_encoding_parameters(self):