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

diff --git a/src/allmydata/node.py b/src/allmydata/node.py
index 0d82777bd02fa3a5e9c82c2d83ec87952464831b..244a1e1d768c951b39daf8946b23854933e96779 100644 (file)
--- 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 6f7217a62e455c9cd4238da6bba8f81347df77c1..cb5e707bfa31bc51c4ab4240f2843da86cf34814 100644 (file)
--- 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):