X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Fcontrollers.py;h=45c2a08f354c743a17b7cb5b891faf9671abc10a;hb=7039d7162f228e4c2312c0dd144c493337c0602e;hp=984813b75c772875f5f4b83a13bc2f48249a400a;hpb=334378a14103c3fd02332b6ce3767553f1fe11d2;p=monitor.git

diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py
index 984813b..45c2a08 100644
--- 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 not node.site:
+                                node.site = HistorySiteRecord.by_loginbase("ple")
 			
 
 	node.history = HistoryNodeRecord.by_hostname(node.hostname)
@@ -193,7 +195,11 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 			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':