From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Wed, 3 Jun 2009 23:00:03 +0000 (+0000)
Subject: controllers should allow refreshes while findall is running.
X-Git-Tag: Monitor-3.0-13~5
X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=commitdiff_plain;h=40588e1f900ba82db3ca69c5cc375805028f2430

controllers should allow refreshes while findall is running.
add description to RunlevelAgent
something is failing in the monitor-server-deps post install process for
	easy_setup dependencies.
---

diff --git a/Monitor.spec b/Monitor.spec
index 31ffe55..ce120ff 100644
--- a/Monitor.spec
+++ b/Monitor.spec
@@ -211,6 +211,11 @@ rm -rf $RPM_BUILD_ROOT
 %post server-deps
 easy_install --build-directory /var/tmp -UZ Elixir
 easy_install --build-directory /var/tmp -UZ ElementTree
+# TODO: something is bad wrong with this approach.
+#easy_install --build-directory /var/tmp -UZ http://pypi.python.org/packages/2.5/E/Extremes/Extremes-1.1-py2.5.egg
+#easy_install --build-directory /var/tmp -UZ "Paste==1.5.1"
+#easy_install --build-directory /var/tmp -UZ "PasteDeploy==1.3.1"
+
 easy_install --build-directory /var/tmp -UZ http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.5.3.tar.gz
 easy_install --build-directory /var/tmp -UZ http://files.turbogears.org/eggs/TurboGears-1.0.7-py2.5.egg
 
diff --git a/RunlevelAgent.py b/RunlevelAgent.py
index 218a87d..04dcfee 100644
--- a/RunlevelAgent.py
+++ b/RunlevelAgent.py
@@ -1,4 +1,11 @@
 #!/usr/bin/python
+#
+# RunlevelAgent - acts as a heartbeat back to myplc reporting that the node is
+# 	online and whether it is in boot or pre-boot run-level.
+#   This is useful to identify nodes that are behind a firewall, as well as to
+#   have the machine report run-time status both in safeboot and boot modes,
+#   so that it is immediately visible at myplc (gui or api).
+# 
 
 import xml, xmlrpclib
 import logging
diff --git a/monitor/bootman.py b/monitor/bootman.py
index 4693315..36d8b35 100755
--- a/monitor/bootman.py
+++ b/monitor/bootman.py
@@ -471,6 +471,7 @@ class DebugInterface:
 		# update_node_config_email
 		for n in ["bminit-cfg-exception-nocfg-update-bootupdatefail-nonode-debug-done",
 				  "bminit-cfg-exception-update-bootupdatefail-nonode-debug-done",
+				  "bminit-cfg-exception-update-bootupdatefail-nonode-debug-validate-exception-done",
 				  "bminit-cfg-auth-bootcheckfail-nonode-exception-update-bootupdatefail-nonode-debug-done",
 				]:
 			sequences.update({n : "update_node_config_email"})
diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py
index 66c6b36..33f88e1 100644
--- a/web/MonitorWeb/monitorweb/controllers.py
+++ b/web/MonitorWeb/monitorweb/controllers.py
@@ -186,6 +186,9 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 			#node.history.status
 			#print node.hostname
 
+			if not node.history:
+				continue
+
 			if node.history.status in ['down', 'offline']:
 				if node.plc_node_stats and node.plc_node_stats['last_contact'] != None:
 					filtercount['down'] += 1