changes for 3.0

[monitor.git] / comon.py

diff --git a/comon.py b/comon.py
index 75d4165..8d96e16 100755 (executable)
--- a/comon.py
+++ b/comon.py
@@ -42,10 +42,10 @@ COMONURL = "http://summer.cs.princeton.edu/status/tabulator.cgi?table=table_node
 
 def _tohash(rawdata):
        # First line Comon returns is list of keys with respect to index
-       keys = rawdata.readline().rstrip().split(", ")
-       l_host = []
-       hash = {}
        try:
+               keys = rawdata.readline().rstrip().split(", ")
+               l_host = []
+               hash = {}
                i_ignored = 0
                for line in rawdata.readlines():
                        l_host = line.rstrip().split(", ")              # split the line on ', '
@@ -245,12 +245,6 @@ def main():
                        print("%-40s \t Bootstate %s nodetype %s kernver %s keyok %s" % ( 
                                host, cdb[host]['bootstate'], cdb[host]['nodetype'], 
                                cdb[host]['kernver'], cdb[host]['keyok']))
-                       #ssh = soltesz.SSH('root', host)
-                       #try:
-                       #       val = ssh.run("uname -r")
-                       #       print "%s == %s" % (host, val),
-                       #except:
-                       #       pass
        #       else:
        #               print("key mismatch at: %s" % host)
        #print a.codata['michelangelo.ani.univie.ac.at']