Changeset 476:da0c88c9c942

Timestamp:

08/28/08 19:07:37 (4 months ago)

Author:

Brian Warner <warner@allmydata.com>

branch:

default

Message:

add versions to incident headers. Also for #80

Files:

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

ChangeLog

@@ -1 +1 @@
-2008-08-28  Brian Warner  <warner@lothar.com>
+
+        * foolscap/logging/incident.py (IncidentReporter.incident_declared):
+        put versions in the incident header too, also for #80.
+        * foolscap/test/test_logging.py (Incidents.test_basic): test it
-
-        * foolscap/logging/tail.py (LogPrinter.got_versions): record

foolscap/logging/incident.py

@@ -83 +83 @@
-        self.f1 = open(self.abs_filename, "wb")
-        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,
+                             "versions": versions,
-                             }}
-        pickle.dump(header, self.f1)

foolscap/test/test_logging.py

@@ -247 +247 @@
-            self.failUnlessEqual(events[0]["header"]["trigger"]["message"],
-                                 "3-trigger")
+            self.failUnlessEqual(events[0]["header"]["versions"]["foolscap"],
+                                 foolscap.__version__)
-            self.failUnlessEqual(events[3]["d"]["message"], "3-trigger")
-
@@ -260 +262 @@
-            self.failUnlessEqual(events[0]["header"]["trigger"]["message"],
-                                 "3-trigger")
+            self.failUnlessEqual(events[0]["header"]["versions"]["foolscap"],
+                                 foolscap.__version__)
-            self.failUnlessEqual(events[3]["d"]["message"], "3-trigger")
-            self.failUnlessEqual(events[4]["d"]["message"], "4-trailing")