moved found_within to common.py

[monitor.git] / monitor / common.py

diff --git a/monitor/common.py b/monitor/common.py
index 6f88051..aecd866 100644 (file)
--- a/monitor/common.py
+++ b/monitor/common.py
@@ -224,17 +224,28 @@ def email_exception(content=None):
 
 def changed_lessthan(last_changed, days):
        if datetime.now() - last_changed <= timedelta(days):
-               print "last changed less than %s" % timedelta(days)
+               #print "last changed less than %s" % timedelta(days)
                return True
        else:
-               print "last changed more than %s" % timedelta(days)
+               #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)
+               #print "last changed more than %s" % timedelta(days)
                return True
        else:
-               print "last changed less than %s" % timedelta(days)
+               #print "last changed less than %s" % timedelta(days)
                return False
        
+def found_within(recent_actions, action_type, within):
+       for action in recent_actions:
+               if action_type == action.action_type and \
+                               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
+