Changeset 477:c8aca5d2edc1

Timestamp:

08/29/08 13:00:45 (4 months ago)

Author:

Brian Warner <warner@allmydata.com>

branch:

default

Message:

logging: move app_versions out to a separate module, provide a setter

Files:

• ChangeLog (modified) (1 diff)
• foolscap/logging/app_versions.py (added)
• foolscap/logging/incident.py (modified) (2 diffs)
• foolscap/logging/publish.py (modified) (3 diffs)
• foolscap/test/test_logging.py (modified) (1 diff)

ChangeLog

@@ +1 @@
+2008-08-29  Brian Warner  <warner@lothar.com>
+
+        * foolscap/logging/app_versions.py (versions): move the
+        application version dict (which gets reported to remote
+        subscribers, and copied into logfiles) to a separate module. It
+        was causing circular import problems when it lived in an attribute
+        of LogPublisher.
+        (add_version): provide a setter method
+        * foolscap/logging/publish.py (LogPublisher.versions): same
+        (LogPublisher.remote_get_versions): same
+        * foolscap/logging/incident.py (IncidentReporter.incident_declared):
+        same
+
+        * foolscap/test/test_logging.py (IncidentGatherer.test_emit):
+        improve test shutdown a little bit
+
-2008-08-28  Brian Warner  <warner@lothar.com>
-

foolscap/logging/incident.py

@@ -4 +4 @@
-from twisted.internet import reactor
-from foolscap.logging.interfaces import IIncidentReporter
-
+, app_versions
-from foolscap.eventual import eventually
-from foolscap import base32
@@ -84 +84 @@
-        self.f2 = bz2.BZ2File(self.abs_filename_bz2_tmp, "wb")
-
-        # there's some weird circular import that prevents this from being
-        # imported at the top level
-        from foolscap.logging.publish import LogPublisher
-        versions = LogPublisher.versions
-
-        # write header with triggering_event
-        header = {"header": {"type": "incident",
-                             "trigger": triggering_event,
-
+app_versions.
-                             }}
-        pickle.dump(header, self.f1)

foolscap/logging/publish.py

@@ -9 +9 @@
-from foolscap.referenceable import Referenceable
-from foolscap.logging.interfaces import RISubscription, RILogPublisher
+from foolscap.logging import app_versions
-from foolscap.eventual import eventually
-
@@ -164 +165 @@
-    implements(RILogPublisher)
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    def __init__(self, logger):
@@ -178 +175 @@
-
-    def remote_get_versions(self):
-self
+app_versions
-    def remote_get_pid(self):
-        return os.getpid()

foolscap/test/test_logging.py

@@ -1100 +1100 @@
-                      self.poll(lambda : self.ig4.incidents_received == 2))
-
-Callback(self.stall, 0.5)
+Both(self.stall, 0.5) # allow shutdown even on error
-
-        return d