X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sitebad.py;h=1261bcc3fb73f2ecd90bfade137d3e8842175c6a;hb=6c38b5cef7bf12fa4ade23ae1c54b3491797fb1d;hp=4d9ee33b45ab9ccdbfcb95ed20862c249c1d0687;hpb=c9d06f3b274ecbc092a0b3eb1f5ceb6c0f734aad;p=monitor.git

diff --git a/sitebad.py b/sitebad.py
index 4d9ee33..1261bcc 100755
--- a/sitebad.py
+++ b/sitebad.py
@@ -14,7 +14,7 @@ from monitor.wrapper import plc, plccache
 from monitor.const import MINUP
 
 from monitor.common import *
-from nodequery import verify,query_to_dict,node_select
+from monitor.query import verify,query_to_dict,node_select
 from monitor.model import *
 
 api = plc.getAuthAPI()
@@ -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,6 +53,7 @@ def getnodesup(nodelist):
 				up = up + 1
 		except:
 			import traceback
+			email_exception(node['hostname'])
 			print traceback.print_exc()
 	return up
 
@@ -107,6 +110,7 @@ def checkAndRecordState(l_sites, l_plcsites):
 															'penalty_level' : 0})
 			sitehist.last_checked = datetime.now()
 
+			sitehist.plc_siteid = d_site['site_id']
 			sitehist.slices_total = d_site['max_slices']
 			sitehist.slices_used = len(d_site['slice_ids'])
 			sitehist.nodes_total = len(lb2hn[sitename])