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

diff --git a/policy.py b/policy.py
index edff7bd..fe54863 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
 
 
@@ -119,12 +119,17 @@ def main(hostnames, sitenames):
 			#	sitehist.sendMessage('retry_bootman', hostname=host)
 
 		if nodehist.status == 'down' and \
-			changed_greaterthan(nodehist.last_changed, 2) and \
-			not found_within(recent_actions, 'down_notice', 3.5):
-				# send down node notice
-
-				sitehist.sendMessage('down_notice', hostname=host)
-				print "send message for host %s down" % host
+			changed_greaterthan(nodehist.last_changed, 2):
+				if not nodehist.firewall and not found_within(recent_actions, 'down_notice', 3.5):
+					# send down node notice
+					sitehist.sendMessage('down_notice', hostname=host)
+					print "send message for host %s down" % host
+
+				if nodehist.firewall and not found_within(recent_actions, 'firewall_notice', 3.5):
+					# send down node notice
+					email_exception(host, "firewall_notice")
+					sitehist.sendMessage('firewall_notice', hostname=host)
+					print "send message for host %s down" % host
 
 		node_count = node_count + 1
 		print "time: ", time.strftime('%Y-%m-%d %H:%M:%S')
@@ -134,9 +139,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 +262,6 @@ if __name__ == "__main__":
 		session.flush()
 		sys.exit(0)
 	except:
-		#email_exception()
+		email_exception()
 		print traceback.print_exc();
 		print "fail all..."