fix db consistency 'IntegryErrors'

[monitor.git] / sitebad.py

diff --git a/sitebad.py b/sitebad.py
index f90f887..6c09c1c 100755 (executable)
--- a/sitebad.py
+++ b/sitebad.py
@@ -44,6 +44,8 @@ def getnodesup(nodelist):
        up = 0
        for node in nodelist:
                try:
+                       # NOTE: adding a condition for nodehist.haspcu would include pcus
+                       #               in the calculation
                        nodehist = HistoryNodeRecord.findby_or_create(hostname=node['hostname'])
                        nodebl   = BlacklistRecord.get_by(hostname=node['hostname'])
                        if (nodehist is not None and nodehist.status != 'down') or \
@@ -51,42 +53,42 @@ def getnodesup(nodelist):
                                up = up + 1
                except:
                        import traceback
+                       email_exception(node['hostname'])
                        print traceback.print_exc()
        return up
 
 def check_site_state(rec, sitehist):
 
-       if sitehist.new and sitehist.status != 'new':
+       if sitehist.new and sitehist.status not in ['new', 'online', 'good']:
                sitehist.status = 'new'
+               sitehist.penalty_applied = True         # because new sites are disabled by default, i.e. have a penalty.
                sitehist.last_changed = datetime.now()
 
-       if not sitehist.new:
+       if sitehist.nodes_up >= MINUP:
 
-               if sitehist.nodes_up >= MINUP:
+               if sitehist.status != 'online' and sitehist.status != 'good':
+                       sitehist.last_changed = datetime.now()
 
-                       if sitehist.status != 'online' and sitehist.status != 'good':
-                               sitehist.last_changed = datetime.now()
+               if changed_lessthan(sitehist.last_changed, 0.5) and sitehist.status != 'online':
+                       print "changed status from %s to online" % sitehist.status
+                       sitehist.status = 'online'
 
-                       if changed_lessthan(sitehist.last_changed, 0.5) and sitehist.status != 'online':
-                               print "changed status from %s to online" % sitehist.status
-                               sitehist.status = 'online'
+               if changed_greaterthan(sitehist.last_changed, 0.5) and sitehist.status != 'good':
+                       print "changed status from %s to good" % sitehist.status
+                       sitehist.status = 'good'
 
-                       if changed_greaterthan(sitehist.last_changed, 0.5) and sitehist.status != 'good':
-                               print "changed status from %s to good" % sitehist.status
-                               sitehist.status = 'good'
+       elif not sitehist.new:
        
-               else: # sitehist.nodes_up < MINUP:
+               if sitehist.status != 'offline' and sitehist.status != 'down':
+                       sitehist.last_changed = datetime.now()
 
-                       if sitehist.status != 'offline' and sitehist.status != 'down':
-                               sitehist.last_changed = datetime.now()
+               if changed_lessthan(sitehist.last_changed, 0.5) and sitehist.status != 'offline':
+                       print "changed status from %s to offline" % sitehist.status
+                       sitehist.status = 'offline'
 
-                       if changed_lessthan(sitehist.last_changed, 0.5) and sitehist.status != 'offline':
-                               print "changed status from %s to offline" % sitehist.status
-                               sitehist.status = 'offline'
-
-                       if changed_greaterthan(sitehist.last_changed, 0.5) and sitehist.status != 'down':
-                               print "changed status from %s to down" % sitehist.status
-                               sitehist.status = 'down'
+               if changed_greaterthan(sitehist.last_changed, 0.5) and sitehist.status != 'down':
+                       print "changed status from %s to down" % sitehist.status
+                       sitehist.status = 'down'
 
 def checkAndRecordState(l_sites, l_plcsites):
        count = 0