X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Fcontrollers.py;h=e2fb9bd449bfcbb7babf3874f6047aa2e05f7150;hb=3f2acbd8b7761dae4bb02fedd3557e1003cafb43;hp=7cbaf4fa8741247a9eec7e65fe1acf88eeeedbac;hpb=6a452e8ece2ca8a47105c128eaebc38507bc76c5;p=monitor.git

diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py
index 7cbaf4f..e2fb9bd 100644
--- a/web/MonitorWeb/monitorweb/controllers.py
+++ b/web/MonitorWeb/monitorweb/controllers.py
@@ -8,13 +8,14 @@ import cherrypy
 # log = logging.getLogger("monitorweb.controllers")
 import re
 from monitor.database.info.model import *
-from monitor.database.zabbixapi.model import *
-from monitor.database.dborm import zab_session as session
-from monitor.database.dborm import zab_metadata as metadata
+#from monitor.database.zabbixapi.model import *
+#from monitor.database.dborm import zab_session as session
+#from monitor.database.dborm import zab_metadata as metadata
 from monitor_xmlrpc import MonitorXmlrpcServer
 
 from monitor import reboot
 from monitor import scanapi
+import time
 
 from monitor.wrapper.plccache import plcdb_id2lb as site_id2lb
 from monitor.wrapper.plccache import plcdb_hn2lb as site_hn2lb
@@ -137,6 +138,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)
@@ -153,7 +156,6 @@ def prep_node_for_display(node):
 class Root(controllers.RootController, MonitorXmlrpcServer):
 	@expose(template="monitorweb.templates.welcome")
 	def index(self):
-		import time
 		# log.debug("Happy TurboGears Controller Responding For Duty")
 		flash("Your application is now running")
 		return dict(now=time.ctime())
@@ -162,16 +164,19 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 	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)
 
 	@expose(template="monitorweb.templates.nodelist")
 	def node(self, filter='boot'):
-		import time
+		print "NODE------------------"
+		print "befor-len: ", len( [ i for i in session] )
+		session.flush(); session.clear()
+		print "after-len: ", len( [ i for i in session] )
 		fbquery = FindbadNodeRecord.get_all_latest()
 		query = []
 		filtercount = {'down' : 0, 'boot': 0, 'debug' : 0, 'diagnose' : 0, 'disabled': 0, 
@@ -180,7 +185,8 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 			# NOTE: reformat some fields.
 			prep_node_for_display(node)
 
-			node.history.status
+			#node.history.status
+			#print node.hostname
 
 			if node.history.status in ['down', 'offline']:
 				if node.plc_node_stats and node.plc_node_stats['last_contact'] != None:
@@ -192,7 +198,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':
@@ -421,7 +431,10 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 
 	@expose(template="monitorweb.templates.pculist")
 	def pcu(self, filter='all'):
-		import time
+		print "PCUVIEW------------------"
+		print "befor-len: ", len( [ i for i in session] )
+		session.flush(); session.clear()
+		print "after-len: ", len( [ i for i in session] )
 		fbquery = FindbadPCURecord.get_all_latest()
 		query = []
 		filtercount = {'ok' : 0, 'NetDown': 0, 'Not_Run' : 0, 'pending' : 0, 'all' : 0}
@@ -468,6 +481,10 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 
 	@expose(template="monitorweb.templates.sitelist")
 	def site(self, filter='all'):
+		print "SITE------------------"
+		print "befor-len: ", len( [ i for i in session] )
+		session.flush(); session.clear()
+		print "after-len: ", len( [ i for i in session] )
 		filtercount = {'good' : 0, 'down': 0, 'online':0, 'offline' : 0, 'new' : 0, 'pending' : 0, 'all' : 0}
 		fbquery = HistorySiteRecord.query.all()
 		query = []