X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=policy.py;h=84bdb445a17e40086f1f07ff4f4eca6ea4f149ce;hb=cb01884d466b6250c1f7351e3b68c7c8a3699c62;hp=edff7bdd279b10fdb6708bee188416f33ef7a920;hpb=4cb581d60be6b121a387f5ff2d033fa17e2a6d3a;p=monitor.git

diff --git a/policy.py b/policy.py
index edff7bd..84bdb44 100755
--- 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,13 @@ 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
+			sitehist.clearPenalty()
+			sitehist.applyPenalty()
 			continue
 
 		# TODO: make query only return records within a certin time range,
@@ -253,6 +257,6 @@ if __name__ == "__main__":
 		session.flush()
 		sys.exit(0)
 	except:
-		#email_exception()
+		email_exception()
 		print traceback.print_exc();
 		print "fail all..."