Get custom state names for each of the jobs now

4 files changed, 7 insertions, 2 deletions

diff --git a/jobs/HTTPServerChecker.py b/jobs/HTTPServerChecker.py
index ec2a9d6..965e977 100755
--- a/jobs/HTTPServerChecker.py
+++ b/jobs/HTTPServerChecker.py
@@ -14,6 +14,7 @@ class HTTPServerChecker(JobSpawner.JobSpawner):
 

     class ServerChecker(JobBase.JobBase):

         def __init__(self, config, url, frequency, failureNotificationFrequency):

+            JobBase.JobBase.__init__(self, config, url, frequency, failureNotificationFrequency)

             self.config = config

             self.url = url

             self.frequency = frequency

diff --git a/jobs/JobBase.py b/jobs/JobBase.py
index 29ca443..416f28d 100755
--- a/jobs/JobBase.py
+++ b/jobs/JobBase.py
@@ -2,6 +2,7 @@
 
 import time
 import random
+import hashlib
 import logging
 import datetime
 
@@ -21,8 +22,9 @@ class JobFailureNotificationFrequency:
     ONSTATECHANGE = "state_change"
 
 class JobBase:
-    def __init__(self, config):
+    def __init__(self, config, *args):
         self.config = config
+        self.stateName = hashlib.sha1(self.getName() + "|" + "|".join(args)).hexdigest()
 
     """ Return a friendly name to identify this Job"""
     def getName(self):
@@ -32,7 +34,7 @@ class JobBase:
        Needed to keep track of the job's run history. 
        Takes into account the contructor arguments to uniquely identify JobSpawner-jobs"""
     def getStateName(self):
-        return self.getName()
+        return self.stateName
 
     """Returns True if the job should execute this cron-run"""
     def shouldExecute(self, cronmode):
diff --git a/jobs/PeerChecker.py b/jobs/PeerChecker.py
index 12ce8d8..d271419 100755
--- a/jobs/PeerChecker.py
+++ b/jobs/PeerChecker.py
@@ -13,6 +13,7 @@ import JobSpawner
 class PeerChecker(JobSpawner.JobSpawner):

     class IndividualPeerChecker(JobBase.JobBase):

         def __init__(self, config, checkurl, notificationAddress):

+            JobBase.JobBase.__init__(self, config, checkurl, notificationAddress)

             self.checkurl = checkurl

             self.notificationAddress = notificationAddress

 

diff --git a/jobs/TCPServerChecker.py b/jobs/TCPServerChecker.py
index 642e188..bdb914c 100755
--- a/jobs/TCPServerChecker.py
+++ b/jobs/TCPServerChecker.py
@@ -14,6 +14,7 @@ class TCPServerChecker(JobSpawner.JobSpawner):
 

     class ServerChecker(JobBase.JobBase):

         def __init__(self, config, ip, port, friendlyName, frequency, failureNotificationFrequency):

+            JobBase.JobBase.__init__(self, config, ip, port, friendlyName, frequency, failureNotificationFrequency)

             self.config = config

             self.ip = ip

             self.port = port