Changeset 493:b79718df78d5

Timestamp:

10/14/08 12:54:35 (3 months ago)

Author:

Brian Warner <warner@allmydata.com>

branch:

default

Message:

incident-gatherer: load all 'classify_*.py' files as classifier plugins

Files:

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

ChangeLog

@@ +1 @@
+2008-10-14  Brian Warner  <warner@allmydata.com>
+
+        * foolscap/logging/gatherer.py
+        (IncidentGathererService.add_classify_files): make the incident
+        gatherer look in its base directory for "classify_*.py" files, use
+        them as plugins with classification functions.
+        (INCIDENT_GATHERER_TACFILE): update example text to match
+        * foolscap/test/test_logging.py (IncidentGatherer): test it
+        (Gatherer.test_wrongdir): exercise another error case
+        * doc/logging.xhtml (gatherer): document it
+
-2008-10-13  Brian Warner  <warner@allmydata.com>
-

doc/logging.xhtml

@@ -891 +891 @@
-<p>The Incident Gatherer uses a collection of user-supplied classification
-functions to analyze each Incident and place it into one or more categories.
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-<p>The <code>classified/</code> directory will contain a file for each

foolscap/logging/gatherer.py

@@ -426 +426 @@
-
-    def add_classifier(self, f):
+        # there are old .tac files that call this explicitly
-        self.classifiers.append(f)
-
@@ -436 +437 @@
-        if not os.path.isdir(outputdir):
-            os.makedirs(outputdir)
+        self.add_classify_files()
-        self.classify_stored_incidents(indir)
-        GatheringBase.startService(self)
+
+    def add_classify_files(self):
+        for fn in os.listdir(self.basedir):
+            if not (fn.startswith("classify_") and fn.endswith(".py")):
+                continue
+            f = open(os.path.join(self.basedir, fn), "r")
+            localdict = {}
+            exec f in localdict
+            self.add_classifier(localdict["classify_incident"])
-
-    def classify_stored_incidents(self, indir):
@@ -535 +546 @@
-gs = gatherer.IncidentGathererService()
-
-
+
+
+
-#
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-application = service.Application('incident_gatherer')

foolscap/test/test_logging.py

@@ -1023 +1023 @@
-            self.remove_classified_incidents(ig)
-            ig2 = self.create_incident_gatherer(basedir, [classify_boom])
-
+
+
+
+
+
+
+
+
+
+
+
-            ig2.setServiceParent(self.parent)
+            # now that it's been read, delete it to avoid affecting later
+            # runs
+            os.unlink(foomfile)
-            self.ig2 = ig2
-
@@ -1198 +1211 @@
-        self.failUnless(data['d']["failure"].check(SampleError))
-        self.failUnless("whoops2" in str(data['d']["failure"]))
+
+    def test_wrongdir(self):
+        basedir = "logging/Gatherer/wrongdir"
+        os.makedirs(basedir)
+
+        # create a LogGatherer with an unspecified basedir: it should look
+        # for a .tac file in the current directory, not see it, and complain
+        e = self.failUnlessRaises(RuntimeError,
+                                  MyGatherer, None, True, None)
+        self.failUnless("running in the wrong directory" in str(e))
-
-    def test_log_gatherer(self):