moved nodequery common code to monitor/query.py

[monitor.git] / policy.py

diff --git a/policy.py b/policy.py
index cb5d93f..54ac80e 100755 (executable)
--- a/policy.py
+++ b/policy.py
@@ -27,7 +27,7 @@ from monitor.wrapper import plccache
 from monitor.database.info.model import *
 from monitor.database.info.interface import *
 
-from nodequery import verify,query_to_dict,node_select
+from monitor.query import verify,query_to_dict,node_select
 
 api = plc.getAuthAPI()
 
@@ -110,9 +110,11 @@ def main(hostnames, sitenames):
                                        if fbpcu:
                                                args['pcu_name'] = fbpcu.pcu_name()
                                                args['pcu_errors'] = fbpcu.pcu_errors()
+                                               args['plc_pcuid'] = fbpcu.plc_pcuid
                                        else:
                                                args['pcu_name'] = "error looking up pcu name"
                                                args['pcu_errors'] = ""
+                                               args['plc_pcuid'] = 0
 
                                        args['hostname'] = host
                                        sitehist.sendMessage('pcuerror_notice', **args)