Changeset 498:eb90db2d0287

Timestamp:

10/14/08 17:31:02 (3 months ago)

Author:

Brian Warner <warner@allmydata.com>

branch:

default

Message:

web-viewer: mark incident triggers, and add hyperlinks to them from the welcome page. Closes #79.

Files:

• ChangeLog (modified) (1 diff)
• foolscap/logging/web.py (modified) (8 diffs)

ChangeLog

@@ -1 +1 @@
-2008-10-14  Brian Warner  <warner@allmydata.com>
+
+        * foolscap/logging/web.py: mark any incident triggers in the
+        logfile, and add links to them from the welcome page. Closes #79.
-
-        * foolscap/logging/web.py (Reload): add a 'Reload Logfile' button

foolscap/logging/web.py

@@ -96 +96 @@
-                             (lfnum, level, len(levels[level]),
-                              level))
+                if self.viewer.triggers:
+                    data += " <li>Incident Triggers:\n"
+                    data += "  <ul>\n"
+                    for t in self.viewer.triggers:
+                        le = self.viewer.number_map[t]
+                        data += "   <li>"
+                        href_base = "/all-events"
+                        data += le.to_html(href_base)
+                        data += "   </li>\n"
+                    data += "  </ul>\n"
+                    data += " </li>\n"
-                data += " </ul>\n"
-            data += "</ul>\n"
@@ -220 +231 @@
-        if 'parent' in e['d']:
-            self.parent_index = (e['from'], e['d']['parent'])
+        self.is_trigger = False
-
-    LEVELMAP = {
@@ -250 +262 @@
-        if level >= log.UNUSUAL:
-            level_s = self.LEVELMAP.get(level, "") + " "
-return
+data =
-               % (time_s,
-                  self.anchor_index, href_base, self.anchor_index, d['num'],
-                  level_s, msg)
+        if self.is_trigger:
+            data += " [INCIDENT-TRIGGER]"
+        return data
-
-class Reload(resource.Resource):
@@ -307 +322 @@
-    def load_logfiles(self):
-        #self.summary = {} # keyed by logfile name
-
-
+
+
+
+
-
-    def process_logfiles(self, logfiles):
@@ -315 +332 @@
-        number_map = {}
-        roots = []
+        trigger_numbers = []
+        first_event_from = None
-
-        for lf in logfiles:
@@ -323 +342 @@
-
-            for e in self.get_events(lf):
+                if "header" in e:
+                    if e["header"]["type"] == "incident":
+                        t = e["header"]["trigger"]
+                        trigger_numbers.append(t["num"])
-                if "d" not in e:
-                    continue # skip headers
+                if not first_event_from:
+                    first_event_from = e['from']
-                le = LogEvent(e)
-                if le.index:
@@ -337 +362 @@
-                number = d.get("num", None)
-                when = d.get("time")
+                if number in trigger_numbers:
+                    le.is_trigger = True
-
-                if False:
@@ -372 +399 @@
-            summaries[lf] = summary
-
-
+
+
+
-
-    def get_events(self, fn):