Changeset 457:3f80c4282d20

Timestamp:

08/01/08 16:46:11 (5 months ago)

Author:

"Brian Warner <warner@lothar.com>"

branch:

default

Message:

log-gatherer fix timed-rotator vs LoopingCall?(now=true)

Files:

• ChangeLog (modified) (1 diff)
• foolscap/logging/gatherer.py (modified) (2 diffs)
• foolscap/test/test_logging.py (modified) (1 diff)

ChangeLog

@@ -1 +1 @@
-2008-08-01  Brian Warner  <warner@lothar.com>
+
+        * foolscap/logging/gatherer.py (GathererService.do_rotate): oops,
+        implement the precautions claimed by the comment in startService:
+        test self._savefile before doing anything.
+        (GathererService.__init__): set self._savefile to None
+        * foolscap/test/test_logging.py (Gatherer.test_log_gatherer2): add
+        a timed rotator, which caught the problem in do_rotate
-
-        * foolscap/test/test_logging.py (IncidentGatherer.test_emit): add

foolscap/logging/gatherer.py

@@ -153 +153 @@
-        if signal and hasattr(signal, "SIGHUP"):
-            signal.signal(signal.SIGHUP, self._handle_SIGHUP)
+        self._savefile = None
-
-    def _handle_SIGHUP(self, *args):
@@ -181 +182 @@
-
-    def do_rotate(self):
+        if not self._savefile:
+            return
-        self._savefile.close()
-        now = time.time()

foolscap/test/test_logging.py

@@ -1156 +1156 @@
-
-    def test_log_gatherer2(self):
-
+. Also, use a timed rotator.
-        basedir = "logging/Gatherer/log_gatherer2"
-        os.makedirs(basedir)
-
-        # create a gatherer, which will create its own Tub
-None
+3600
-        gatherer.tub_class = GoodEnoughTub
-        gatherer.d = defer.Deferred()