[Python-checkins] r69784 - in tracker/instances/python-dev/detectors: cia.py config.ini.template

[martin.v.loewis]

Author: martin.v.loewis
Date: Thu Feb 19 21:27:04 2009
New Revision: 69784

Log:
Issue #236: Disable cia.vc by default.


Modified:
   tracker/instances/python-dev/detectors/cia.py
   tracker/instances/python-dev/detectors/config.ini.template

Modified: tracker/instances/python-dev/detectors/cia.py
==============================================================================
--- tracker/instances/python-dev/detectors/cia.py	(original)
+++ tracker/instances/python-dev/detectors/cia.py	Thu Feb 19 21:27:04 2009
@@ -2,8 +2,6 @@
 import xmlrpclib
 import cgi
 
-server = "http://CIA.vc"
-
 # CHANGE THESE WHEN INTEGRATING THIS INTO YOUR TRACKER!!!!
 parameters = {
     'name':'Roundup Reactor for CIA',
@@ -39,6 +37,12 @@
 
 
 def sendcia(db, cl, nodeid, oldvalues):
+    try:
+        server = db.config.detectors["CIAVC_SERVER"]
+        if not server:
+            return
+    except KeyError:
+        return
     messages = set(cl.get(nodeid, 'messages'))
     if oldvalues:
         messages -= set(oldvalues.get('messages',()))

Modified: tracker/instances/python-dev/detectors/config.ini.template
==============================================================================
--- tracker/instances/python-dev/detectors/config.ini.template	(original)
+++ tracker/instances/python-dev/detectors/config.ini.template	Thu Feb 19 21:27:04 2009
@@ -6,7 +6,7 @@
 busybody_email= busybody at example.com
 
 # URI to XMLRPC server doing the actual spam check.
-spambayes_uri = http://www.webfast.com:80/sbrpc
+spambayes_uri = http://localhost/not_here
 # These must match the {ham,spam}_cutoff setting in the SpamBayes server
 # config.
 spambayes_ham_cutoff = 0.2
@@ -15,3 +15,5 @@
 spambayes_may_view_spam = User,Coordinator,Developer
 spambayes_may_classify = Coordinator
 spambayes_may_report_misclassified = User,Coordinator,Developer
+
+ciavc_server = http://localhost/not_here