git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- use plekit tables
[monitor.git]
/
web
/
MonitorWeb
/
monitorweb
/
controllers.py
diff --git
a/web/MonitorWeb/monitorweb/controllers.py
b/web/MonitorWeb/monitorweb/controllers.py
index
984813b
..
68f9d6a
100644
(file)
--- a/
web/MonitorWeb/monitorweb/controllers.py
+++ b/
web/MonitorWeb/monitorweb/controllers.py
@@
-137,6
+137,8
@@
def prep_node_for_display(node):
if node.site is None:
# TODO: need a cleaner fix for this...
node.site = HistorySiteRecord.by_loginbase("pl")
if node.site is None:
# TODO: need a cleaner fix for this...
node.site = HistorySiteRecord.by_loginbase("pl")
+ if not node.site:
+ node.site = HistorySiteRecord.by_loginbase("ple")
node.history = HistoryNodeRecord.by_hostname(node.hostname)
node.history = HistoryNodeRecord.by_hostname(node.hostname)
@@
-162,10
+164,10
@@
class Root(controllers.RootController, MonitorXmlrpcServer):
def nodeview(self, hostname=None):
nodequery=[]
if hostname:
def nodeview(self, hostname=None):
nodequery=[]
if hostname:
- for node in FindbadNodeRecord.get_latest_by(hostname=hostname):
-
# NOTE: reformat some fields.
-
prep_node_for_display(node)
-
nodequery += [node]
+ node = FindbadNodeRecord.get_latest_by(hostname=hostname)
+ # NOTE: reformat some fields.
+ prep_node_for_display(node)
+ nodequery += [node]
return self.pcuview(None, None, hostname) # dict(nodequery=nodequery)
return self.pcuview(None, None, hostname) # dict(nodequery=nodequery)
@@
-193,7
+195,11
@@
class Root(controllers.RootController, MonitorXmlrpcServer):
elif node.history.status in ['debug', 'monitordebug']:
filtercount['debug'] += 1
else:
elif node.history.status in ['debug', 'monitordebug']:
filtercount['debug'] += 1
else:
- filtercount[node.history.status] += 1
+ # TODO: need a better fix. filtercount
+ # doesn't maps to GetBootStates() on
+ # 4.3 so this one fails quite often.
+ if filtercount.has_key(node.history.status):
+ filtercount[node.history.status] += 1
## NOTE: count filters
#if node.observed_status != 'DOWN':
## NOTE: count filters
#if node.observed_status != 'DOWN':