www/database.php

[monitor.git] / findbad.py

diff --git a/findbad.py b/findbad.py
index ce41d30..47459ad 100755 (executable)
--- a/findbad.py
+++ b/findbad.py
@@ -5,6 +5,7 @@ import sys
 import string
 import time
 import config
+import util.file
 
 
 # QUERY all nodes.
@@ -342,7 +343,7 @@ def main():
        cohash = cotop.coget(cotop_url)
        l_nodes = syncplcdb.create_plcdb()
        if config.nodelist:
-               f_nodes = config.getListFromFile(config.nodelist)
+               f_nodes = util.file.getListFromFile(config.nodelist)
                l_nodes = filter(lambda x: x['hostname'] in f_nodes, l_nodes)
        elif config.node:
                f_nodes = [config.node]
@@ -359,7 +360,8 @@ def main():
        # perform this query after the above options, so that the filter above
        # does not break.
        if config.nodeselect:
-               l_nodes = node_select(config.nodeselect)
+               fb = database.dbLoad("findbad")
+               l_nodes = node_select(config.nodeselect, fb['nodes'].keys(), fb)
 
        print "fetching %s hosts" % len(l_nodes)
 
@@ -373,7 +375,7 @@ if __name__ == '__main__':
 
        parser = parsermodule.getParser(['nodesets'])
 
-       parser.set_defaults( increment=False, dbname="findbadnodes", cachenodes=False)
+       parser.set_defaults( increment=False, dbname="findbad", cachenodes=False)
        parser.add_option("", "--cachenodes", action="store_true",
                                                help="Cache node lookup from PLC")
        parser.add_option("", "--dbname", dest="dbname", metavar="FILE",