change to make findall run over other things.

[monitor.git] / findbad.py

diff --git a/findbad.py b/findbad.py
index 78ba65e..7bb31a0 100755 (executable)
--- a/findbad.py
+++ b/findbad.py
@@ -8,7 +8,7 @@ from datetime import datetime,timedelta
 import threadpool
 import threading
 
-from monitor import util
+from monitor.util import file
 from monitor.util import command
 from monitor import config
 
@@ -111,7 +111,7 @@ def main():
        #cohash = cotop.coget(cotop_url)
        l_nodes = plccache.l_nodes
        if config.nodelist:
-               f_nodes = util.file.getListFromFile(config.nodelist)
+               f_nodes = file.getListFromFile(config.nodelist)
                l_nodes = filter(lambda x: x['hostname'] in f_nodes, l_nodes)
        elif config.node:
                f_nodes = [config.node]
@@ -122,6 +122,13 @@ def main():
        elif config.site:
                site = api.GetSites(config.site)
                l_nodes = api.GetNodes(site[0]['node_ids'], ['hostname'])
+       elif config.sitelist:
+               site_list = config.sitelist.split(',')
+               sites = api.GetSites(site_list)
+               node_ids = []
+               for s in sites:
+                       node_ids += s['node_ids']
+               l_nodes = api.GetNodes(node_ids, ['hostname'])
                
        l_nodes = [node['hostname'] for node in l_nodes]
 
@@ -172,5 +179,3 @@ if __name__ == '__main__':
                print "Saving data... exitting."
                sys.exit(0)
        print "sleeping"
-       #print "final commit"
-       #time.sleep(10)