merge with changes to 2.0 branch, since it will help with a timely completion.

[monitor.git] / showlatlon.py

diff --git a/showlatlon.py b/showlatlon.py
index af01bd7..aa09416 100755 (executable)
--- a/showlatlon.py
+++ b/showlatlon.py
@@ -12,7 +12,6 @@ import comon
 from nodecommon import color_pcu_state, datetime_fromstr
 from nodehistory import get_filefromglob
 import time
-import traceback
 
 # region
 # total
@@ -83,8 +82,8 @@ def main():
                begin = time.strftime(format)
 
        d = datetime_fromstr(begin)
-       fbstr = get_filefromglob(d, "production.findbad")
-       fbpcustr = get_filefromglob(d, "production.findbadpcus")
+       fbstr = get_filefromglob(d, "production.findbad")[0]
+       fbpcustr = get_filefromglob(d, "production.findbadpcus")[0]
 
        l_plcnodes = database.dbLoad("l_plcnodes")
        l_plcsites = database.dbLoad("l_plcsites")
@@ -150,7 +149,6 @@ def main():
                                                'hardware' : gethardwarequality(hostname, fb),
                                                'pcuok' : color_pcu_state(fb['nodes'][hostname]['values']) }
                                        #except:
-                                       #       print traceback.print_exc()
                                        #       print args
                                        #       print fb['nodes'][hostname]['values']
                                        results.append("%(cc)7s %(status)8s %(hardware)8s %(pcuok)8s %(site)15s %(host)42s " % args)