Changeset 473:b1a12e7a1aa4

Timestamp:

08/28/08 18:48:19 (4 months ago)

Author:

Brian Warner <warner@allmydata.com>

branch:

default

Message:

flogtool tail: record remote application versions to the savefile, and show them in 'flogtool dump'. For #80.

Files:

• ChangeLog (modified) (1 diff)
• foolscap/logging/dumper.py (modified) (1 diff)
• foolscap/logging/tail.py (modified) (4 diffs)

ChangeLog

@@ -1 +1 @@
-2008-08-28  Brian Warner  <warner@lothar.com>
+
+        * foolscap/logging/tail.py (LogPrinter.got_versions): record
+        remote application versions to the --save-to file, in the header.
+        Part of #80.
+        * foolscap/logging/dumper.py (LogDumper.start): show those
+        versions with --verbose
-
-        * foolscap/logging/gatherer.py (IncidentObserver): only fetch one

foolscap/logging/dumper.py

@@ -34 +34 @@
-                    t = e["header"]["trigger"]
-                    self.trigger = (t["incarnation"], t["num"])
+                if self.options['verbose']:
+                    print >>self.options.stdout, e
-            if "d" in e:
-                self.print_event(e)

foolscap/logging/tail.py

@@ -19 +19 @@
-        self.nodeid_s = nodeid_s
-        self.f = savefile
+
+    def emit_header(self, versions):
+        header = {"header": {"type": "tail",
+                             "versions": versions}}
+        pickle.dump(header, self.f)
-
-    def remote_msg(self, d):
@@ -64 +69 @@
-        if options["save-to"]:
-            f = open(options["save-to"], "wb")
-            header = {"header": {"type": "tail"}}
-            pickle.dump(header, f)
-            self.saver = LogSaver(target_tubid_s[:8], f)
-        self.output = output
+
+    def got_versions(self, versions):
+        print "Remote Versions:"
+        for k in sorted(versions.keys()):
+            print " %s: %s" % (k, versions[k])
+        if self.saver:
+            self.saver.emit_header(versions)
-
-    def remote_msg(self, d):
@@ -119 +129 @@
-        self._tub.connectTo(target_furl, self._got_logpublisher, target_tubid)
-
-    def _print_versions(self, versions):
-        print "Remote Versions:"
-        for k in sorted(versions.keys()):
-            print " %s: %s" % (k, versions[k])
-
-    def _got_logpublisher(self, publisher, target_tubid):
-        d = publisher.callRemote("get_pid")
@@ -137 +142 @@
-        lp = LogPrinter(self.options, target_tubid)
-        d.addCallback(lambda res: publisher.callRemote("get_versions"))
-self._prin
+lp.go
-        catch_up = bool(self.options["catch-up"])
-        if catch_up: