changes for 3.0

[monitor.git] / nodebad.py

diff --git a/nodebad.py b/nodebad.py
index 8aacf71..d9b6b4c 100755 (executable)
--- a/nodebad.py
+++ b/nodebad.py
@@ -32,10 +32,12 @@ def main(config):
        l_nodes = syncplcdb.create_plcdb()
        l_plcnodes = database.dbLoad("l_plcnodes")
 
-       if config.node:
-               l_nodes = [config.node]
-       else:
-               l_nodes = [node['hostname'] for node in l_plcnodes]
+       l_nodes = get_nodeset(config)
+       print len(l_nodes)
+       #if config.node:
+       #       l_nodes = [config.node]
+       ##else:
+       #       l_nodes = [node['hostname'] for node in l_plcnodes]
        
        checkAndRecordState(l_nodes, l_plcnodes)
 
@@ -56,6 +58,9 @@ def checkAndRecordState(l_nodes, l_plcnodes):
                        externalState['nodes'][nodename]['values'] = values
                        externalState['nodes'][nodename]['round'] = global_round
                else:
+                       pf = PersistFlags(nodename, 1, db='node_persistflags')
+                       print "%d %35s %s since %s" % (count, nodename, pf.status, pf.last_changed)
+                       del pf
                        count += 1
 
                if count % 20 == 0:
@@ -149,6 +154,8 @@ if __name__ == '__main__':
        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)