bug fix in summary template

[monitor.git] / policy.py

diff --git a/policy.py b/policy.py
index edff7bd..f9605ae 100755 (executable)
--- a/policy.py
+++ b/policy.py
@@ -76,7 +76,7 @@ def main(hostnames, sitenames):
                                # NOTE: there is a narrow window in which this command must be
                                #               evaluated, otherwise the notice will not go out.  
                                #               this is not ideal.
-                               sitehist.sendMessage('online_notice', hostname=host, viart=False)
+                               sitehist.sendMessage('online_notice', hostname=host, viart=False, saveact=True)
                                print "send message for host %s online" % host
 
 
@@ -134,9 +134,11 @@ def main(hostnames, sitenames):
        for i,site in enumerate(sitenames):
                sitehist = SiteInterface.get_or_make(loginbase=site)
                siteblack = BlacklistRecord.get_by(loginbase=site)
+               skip_due_to_blacklist=False
 
                if siteblack and not siteblack.expired():
                        print "skipping %s due to blacklist.  will expire %s" % (site, siteblack.willExpire() )
+                       skip_due_to_blacklist=True
                        continue
 
                # TODO: make query only return records within a certin time range,
@@ -253,6 +255,6 @@ if __name__ == "__main__":
                session.flush()
                sys.exit(0)
        except:
-               #email_exception()
+               email_exception()
                print traceback.print_exc();
                print "fail all..."