From: Brian Warner <warner@lothar.com>
Date: Mon, 8 Sep 2008 03:03:08 +0000 (-0700)
Subject: immutable/checker: make log() tolerate the format= form
X-Git-Url: https://git.rkrishnan.org/components/%22news.html/frontends/FTP-and-SFTP.txt?a=commitdiff_plain;h=af2231563ed270d6f5e20951d21cab1285b259c3;p=tahoe-lafs%2Ftahoe-lafs.git

immutable/checker: make log() tolerate the format= form
---

diff --git a/src/allmydata/immutable/checker.py b/src/allmydata/immutable/checker.py
index 71b8e9dc..bfd7b66e 100644
--- a/src/allmydata/immutable/checker.py
+++ b/src/allmydata/immutable/checker.py
@@ -165,12 +165,19 @@ class SimpleCHKFileVerifier(download.FileDownloader):
         num = self._client.log("SimpleCHKFileVerifier(%s): starting" % prefix)
         self._log_number = num
 
-    def log(self, msg, *args, **kwargs):
-        if not kwargs.get('parent'):
+    def log(self, *args, **kwargs):
+        if not "parent" in kwargs:
             kwargs['parent'] = self._log_number
-        return self._client.log("SimpleCHKFileVerifier(%s): %s"
-                                % (self._log_prefix, msg),
-                                *args, **kwargs)
+        # add a prefix to the message, regardless of how it is expressed
+        prefix = "SimpleCHKFileVerifier(%s): " % self._log_prefix
+        if "format" in kwargs:
+            kwargs["format"] = prefix + kwargs["format"]
+        elif "message" in kwargs:
+            kwargs["message"] = prefix + kwargs["message"]
+        elif args:
+            m = prefix + args[0]
+            args = (m,) + args[1:]
+        return self._client.log(*args, **kwargs)
 
 
     def start(self):