added comonquery command-line tool.

[monitor.git] / web / MonitorWeb / monitorweb / controllers.py

diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py
index 984813b..e2fb9bd 100644 (file)
--- a/web/MonitorWeb/monitorweb/controllers.py
+++ b/web/MonitorWeb/monitorweb/controllers.py
@@ -15,6 +15,7 @@ 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, 
@@ -181,7 +186,7 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
                        prep_node_for_display(node)
 
                        #node.history.status
-                       print node.hostname
+                       #print node.hostname
 
                        if node.history.status in ['down', 'offline']:
                                if node.plc_node_stats and node.plc_node_stats['last_contact'] != None:
@@ -193,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':
@@ -422,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}
@@ -469,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 = []