www/printbadnodes.py

[monitor.git] / printbadcsv.py

diff --git a/printbadcsv.py b/printbadcsv.py
index b411b34..f064c11 100755 (executable)
--- a/printbadcsv.py
+++ b/printbadcsv.py
@@ -1,14 +1,15 @@
 #!/usr/bin/python
-import soltesz
-from config import config
-from optparse import OptionParser
+from monitor import database
+from monitor import config
+import parser as parsermodule
+
 from www.printbadnodes import *
 
 def main():
        global fb
-       db = soltesz.dbLoad(config.dbname)
-       fb = soltesz.dbLoad("findbadpcus")
-       act= soltesz.dbLoad("act_all")
+       db = database.dbLoad(config.dbname)
+       fb = database.dbLoad("findbadpcus")
+       act= database.dbLoad("act_all")
 
        ## Field widths used for printing
        maxFieldLengths = { 'nodename' : -45,
@@ -128,7 +129,7 @@ def main():
        print ""
 import cgi
 if __name__ == '__main__':
-       parser = OptionParser()
+       parser = parsermodule.getParser()
        parser.set_defaults(cmpdays=False, 
                                                comon="sshstatus", 
                                                fields="nodename,ping,ssh,pcu,category,state,kernel,bootcd,rt", 
@@ -148,6 +149,5 @@ if __name__ == '__main__':
        parser.add_option("", "--kernel",       dest="cmpkernel", action="store_true", help="")
        parser.add_option("", "--state",        dest="cmpstate", action="store_true", help="")
        parser.add_option("", "--comon",        dest="comon",   help="")
-       config = config(parser)
-       config.parse_args()
+       config = parsermodule.parse_args(parser)
        main()