Tagging module Monitor - Monitor-2.0-6

[monitor.git] / findbad.py

diff --git a/findbad.py b/findbad.py
index 9b348bb..f01f31f 100755 (executable)
--- a/findbad.py
+++ b/findbad.py
@@ -8,8 +8,8 @@ from datetime import datetime,timedelta
 import threadpool
 import threading
 
-from monitor import util
-from monitor.util import command
+from monitor.util import file
+from pcucontrol.util import command
 from monitor import config
 
 from monitor.database.info.model import FindbadNodeRecordSync, FindbadNodeRecord, session
@@ -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]
@@ -175,6 +175,8 @@ if __name__ == '__main__':
                main()
        except Exception, err:
                print traceback.print_exc()
+               from monitor.common import email_exception
+               email_exception()
                print "Exception: %s" % err
                print "Saving data... exitting."
                sys.exit(0)