X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=unified_model.py;h=31b0ef6c1b1cb3eee19237e3443c48289b609856;hb=6f2351e4b44590221425fa9b4bfa77c92db49b6a;hp=844ae5b6792dbe6df17b5f00544fbec027bf26f3;hpb=bc5910f95a3f037ffdc0e66c4e8dd0a1436847eb;p=monitor.git

diff --git a/unified_model.py b/unified_model.py
index 844ae5b..31b0ef6 100755
--- a/unified_model.py
+++ b/unified_model.py
@@ -2,14 +2,14 @@
 
 from monitor import database
 
-import plc
-import mailer
+from monitor.wrapper import plc
+from monitor.wrapper import mailer
 import time
 
 from model import *
-from const import *
+from monitor.const import *
 from monitor import util
-import config
+from monitor import config
 
 def gethostlist(hostlist_file):
 	return util.file.getListFromFile(hostlist_file)
@@ -230,7 +230,7 @@ class PersistMessage(Message):
 			#print "creating new object"
 			obj = super(PersistMessage, typ).__new__(typ, [id, subject, message, via_rt], **kwargs)
 			obj.id = id
-			obj.actiontracker = Recent(3*60*60*24)
+			obj.actiontracker = Recent(1*60*60*24)
 			obj.ticket_id = None
 
 		if 'ticket_id' in kwargs and kwargs['ticket_id'] is not None:
@@ -259,6 +259,7 @@ class PersistMessage(Message):
 			self.save()
 		else:
 			# NOTE: only send a new message every week, regardless.
+			# NOTE: can cause thank-you messages to be lost, for instance when node comes back online within window.
 			print "Not sending to host b/c not within window of %s days" % (self.actiontracker.withintime // (60*60*24))
 
 class MonitorMessage(object):
@@ -539,6 +540,8 @@ class Record(object):
 								 self.data['message'][1] % self.data['args'],
 								 True, db='monitor_persistmessages',
 								 ticket_id=ticket_id)
+			if self.data['stage'] == "improvement":
+				message.reset()
 			return message
 		else:
 			return None