X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodequery.py;h=2fe0e4ab99fc67973c581eeb32b255cc4986b494;hb=e133ad49c55051c7d2a0672499101dbd4986c838;hp=738e58d0d57e66043c3b10495c2fcf17a6c516cb;hpb=3f2acbd8b7761dae4bb02fedd3557e1003cafb43;p=monitor.git

diff --git a/nodequery.py b/nodequery.py
index 738e58d..2fe0e4a 100755
--- a/nodequery.py
+++ b/nodequery.py
@@ -317,6 +317,9 @@ def node_select(str_query, nodelist=None, fb=None):
 			fb_noderec = None
 			#fb_noderec = FindbadNodeRecord.query.filter(FindbadNodeRecord.hostname==node).order_by(FindbadNodeRecord.date_checked.desc()).first()
 			fb_noderec = FindbadNodeRecord.get_latest_by(hostname=node)
+		except KeyboardInterrupt:
+			print "Exiting at user request: Ctrl-C"
+			sys.exit(1)
 		except:
 			print traceback.print_exc()
 			continue
@@ -328,7 +331,6 @@ def node_select(str_query, nodelist=None, fb=None):
 			#if 'plcnode' in fb_nodeinfo:
 			#	fb_nodeinfo.update(fb_nodeinfo['plcnode'])
 
-			#if verifyDBrecord(dict_query, fb_nodeinfo):
 			if verify(dict_query, fb_nodeinfo):
 				#print fb_nodeinfo.keys()
 				#print node #fb_nodeinfo
@@ -414,6 +416,9 @@ def main():
 			fb_noderec = FindbadNodeRecord.get_latest_by(hostname=node) 
 			if not fb_noderec: continue
 			fb_nodeinfo = fb_noderec.to_dict()
+		except KeyboardInterrupt:
+			print "Exiting at user request: Ctrl-C"
+			sys.exit(1)
 		except:
 			print traceback.print_exc()
 			continue