X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=monitor%2Fcommon.py;h=d082dbb05065201f301337868a40d353af81269d;hb=c9d06f3b274ecbc092a0b3eb1f5ceb6c0f734aad;hp=051cd61aea9e23e3cdf8b59f987e97e860b07ef4;hpb=c678c008f0c3a10947b38880e52005a856e1b122;p=monitor.git

diff --git a/monitor/common.py b/monitor/common.py
index 051cd61..d082dbb 100644
--- a/monitor/common.py
+++ b/monitor/common.py
@@ -1,14 +1,14 @@
 
 import time
 import struct
-from pcucontrol import reboot
-
+from monitor import reboot
 from monitor import util
 from monitor import database
 from monitor.wrapper import plc, plccache
 
-from datetime import datetime 
-from monitor.model import PersistFlags
+from datetime import datetime, timedelta
+from monitor.model import Message
+from monitor.database.info import HistoryNodeRecord
 
 esc = struct.pack('i', 27)
 RED  	= esc + "[1;31m"
@@ -86,6 +86,8 @@ def diff_time(timestamp, abstime=True):
 	now = time.time()
 	if timestamp == None:
 		return "unknown"
+	if type(timestamp) == type(datetime.now()):
+		timestamp = time.mktime(timestamp.timetuple())
 	if abstime:
 		diff = now - timestamp
 	else:
@@ -154,7 +156,7 @@ def nodegroup_display(node, fbdata, conf=None):
 		node['pcu'] = "PCU"
 	node['lastupdate'] = diff_time(node['last_contact'])
 
-	pf = PersistFlags(node['hostname'], 1, db='node_persistflags')
+	pf = HistoryNodeRecord.get_by(hostname=node['hostname'])
 	try:
 		node['lc'] = diff_time(pf.last_changed)
 	except:
@@ -211,4 +213,54 @@ def get_nodeset(config):
 		l_nodes = node_select(config.nodeselect, node_list, None)
 
 	return l_nodes
+
+def email_exception(content=None):
+    import config
+    from monitor.model import Message
+    import traceback
+    msg=traceback.format_exc()
+    if content:
+        msg = content + "\n" + msg
+    m=Message("exception running monitor", msg, False)
+    m.send([config.cc_email])
+    return
+
+def changed_lessthan(last_changed, days):
+	if datetime.now() - last_changed <= timedelta(days):
+		#print "last changed less than %s" % timedelta(days)
+		return True
+	else:
+		#print "last changed more than %s" % timedelta(days)
+		return False
+
+def changed_greaterthan(last_changed, days):
+	if datetime.now() - last_changed > timedelta(days):
+		#print "last changed more than %s" % timedelta(days)
+		return True
+	else:
+		#print "last changed less than %s" % timedelta(days)
+		return False
+
+def found_between(recent_actions, action_type, lower, upper):
+	return found_before(recent_actions, action_type, upper) and found_within(recent_actions, action_type, lower)
+
+def found_before(recent_actions, action_type, within):
+	for action in recent_actions:
+		if action_type == action.action_type and \
+				action.date_created < (datetime.now() - timedelta(within)):
+			return True
+	return False
+	
+def found_within(recent_actions, action_type, within):
+	for action in recent_actions:
+		#print "%s - %s %s > %s - %s (%s) ==> %s" % (action.loginbase, action.action_type, action.date_created, datetime.now(), timedelta(within), datetime.now()-timedelta(within), action.date_created > (datetime.now() - timedelta(within)) )
+		if action_type == action.action_type and \
+				action.date_created > (datetime.now() - timedelta(within)):
+				#datetime.now() - action.date_created < timedelta(within):
+			# recent action of given type.
+			#print "%s found_within %s in recent_actions from %s" % (action_type, timedelta(within), action.date_created)
+			return True
+
+	print "%s NOT found_within %s in recent_actions" % (action_type, timedelta(within) )
+	return False