X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sitebad.py;h=ecf40677a2b9db3c724cac4decc03c4465087b25;hb=refs%2Fheads%2F1.0;hp=c9e0033d8446213ecb7b062960d05157835f380b;hpb=6496f5b4a0220e4055fee76c97f92293f9559117;p=monitor.git

diff --git a/sitebad.py b/sitebad.py
index c9e0033..ecf4067 100755
--- a/sitebad.py
+++ b/sitebad.py
@@ -13,10 +13,9 @@ import syncplcdb
 from nodequery import verify,query_to_dict,node_select
 
 import plc
-import auth
-api = plc.PLC(auth.auth, auth.plc)
+api = plc.getAuthAPI()
 from unified_model import *
-from monitor_policy import MINUP
+from const import MINUP
 
 round = 1
 externalState = {'round': round, 'sites': {}}
@@ -56,6 +55,9 @@ def checkAndRecordState(l_sites, l_plcsites):
 			externalState['sites'][sitename]['values'] = values
 			externalState['sites'][sitename]['round'] = global_round
 		else:
+			pf = PersistFlags(sitename, 1, db=config.dbpfname )
+			print "%d noinc %15s slices(%2s) nodes(%2s) up(%2s) %s" % (count, sitename, pf.slices_used, 
+										pf.nodes_total, pf.nodes_up, pf.status)
 			count += 1
 
 		if count % 20 == 0:
@@ -89,7 +91,7 @@ def collectStatusAndState(sitename, l_plcsites):
 		return None
 
 	if sitename in lb2hn:
-		pf = PersistFlags(sitename, 1, db='site_persistflags')
+		pf = PersistFlags(sitename, 1, db=config.dbpfname )
 
 		if not pf.checkattr('last_changed'):
 			pf.last_changed = time.time()
@@ -120,11 +122,11 @@ def collectStatusAndState(sitename, l_plcsites):
 	return True
 
 if __name__ == '__main__':
-	from config import config
-	from optparse import OptionParser
-	parser = OptionParser()
+	import parser as parsermodule
+
+	parser = parsermodule.getParser()
 	parser.set_defaults(filename=None, node=None, site=None, nodeselect=False, nodegroup=None, 
-						increment=False, dbname="sitebad", cachenodes=False)
+						increment=False, dbname="sitebad", dbpfname="site_persistflags", cachenodes=False)
 	parser.add_option("", "--site", dest="site", metavar="login_base", 
 						help="Provide a single site to operate on")
 	parser.add_option("", "--sitelist", dest="sitelist", metavar="file.list", 
@@ -132,16 +134,19 @@ if __name__ == '__main__':
 
 	parser.add_option("", "--dbname", dest="dbname", metavar="FILE", 
 						help="Specify the name of the database to which the information is saved")
+	parser.add_option("", "--dbpfname", dest="dbpfname", metavar="FILE", 
+						help="Specify the persistflags db name")
 	parser.add_option("-i", "--increment", action="store_true", dest="increment", 
 						help="Increment round number to force refresh or retry")
-	config = config(parser)
-	config.parse_args()
+	config = parsermodule.parse_args(parser)
 
 	try:
 		main(config)
 	except Exception, err:
 		import traceback
 		print traceback.print_exc()
+		from nodecommon import email_exception
+		email_exception()
 		print "Exception: %s" % err
 		print "Saving data... exitting."
 		database.dbDump(config.dbname, externalState)