From 06d554433bc8c7090c80ae39cdc8f906a6697fb5 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Tue, 10 Mar 2009 22:18:47 +0000 Subject: [PATCH] fixed runtime errors for findall default values added fix for site lookup for nodes without correct status information --- findall.py | 2 +- monitor/common.py | 2 +- web/MonitorWeb/monitorweb/controllers.py | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/findall.py b/findall.py index 8be5b27..26335e0 100755 --- a/findall.py +++ b/findall.py @@ -11,7 +11,7 @@ if __name__ == '__main__': parser = parsermodule.getParser(['nodesets']) parser.set_defaults( increment=False, dbname="findbad", cachenodes=False, - force=False,) + force=False, pcuselect=None, pcuid=None) parser.add_option("", "--cachenodes", action="store_true", help="Cache node lookup from PLC") parser.add_option("", "--dbname", dest="dbname", metavar="FILE", diff --git a/monitor/common.py b/monitor/common.py index 8bddae1..be4a171 100644 --- a/monitor/common.py +++ b/monitor/common.py @@ -214,7 +214,7 @@ def get_nodeset(config): def email_exception(content=None): import config - from unified_model import Message + from monitor.model import Message import traceback msg=traceback.format_exc() if content: diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py index bb0580b..a95f3d6 100644 --- a/web/MonitorWeb/monitorweb/controllers.py +++ b/web/MonitorWeb/monitorweb/controllers.py @@ -132,6 +132,10 @@ def prep_node_for_display(node): if node.loginbase: node.site = HistorySiteRecord.by_loginbase(node.loginbase) + if node.site is None: + # TODO: need a cleaner fix for this... + node.site = HistorySiteRecord.by_loginbase("pl") + node.history = HistoryNodeRecord.by_hostname(node.hostname) @@ -168,13 +172,14 @@ class Root(controllers.RootController): import time fbquery = FindbadNodeRecord.get_all_latest() query = [] - filtercount = {'DOWN' : 0, 'BOOT': 0, 'DEBUG' : 0, 'neverboot' : 0, 'pending' : 0, 'all' : 0} + filtercount = {'DOWN' : 0, 'BOOT': 0, 'DEBUG' : 0, 'neverboot' : 0, 'pending' : 0, 'all' : 0, None : 0} for node in fbquery: # NOTE: reformat some fields. prep_node_for_display(node) # NOTE: count filters if node.observed_status != 'DOWN': + print node.hostname, node.observed_status filtercount[node.observed_status] += 1 else: if node.plc_node_stats and node.plc_node_stats['last_contact'] != None: -- 2.43.0