clearer names for actions, and infer actions better

[monitor.git] / monitor / model.py

diff --git a/monitor/model.py b/monitor/model.py
index b4db483..5d0fc05 100755 (executable)
--- a/monitor/model.py
+++ b/monitor/model.py
@@ -2,7 +2,7 @@
 
 from monitor import database
 
-from monitor.wrapper import plc, plccache
+from monitor.wrapper import plc
 from monitor.wrapper import mailer
 import time
 
@@ -413,6 +413,7 @@ class Target:
 class Record(object):
 
        def __init__(self, hostname, data):
+               from monitor.wrapper import plccache
                self.hostname = hostname
                self.data = data
                self.plcdb_hn2lb = plccache.plcdb_hn2lb
@@ -527,6 +528,8 @@ class Record(object):
                else:
                        print "takeAction: increasing penalty for %s"%self.hostname
                        pp.increase()
+
+               print "takeAction: applying penalty to %s as index %s"% (self.hostname, index)
                pp.index = index
                pp.apply(self.hostname)
                pp.save()