apply penalties

[monitor.git] / monitor / database / info / interface.py

diff --git a/monitor/database/info/interface.py b/monitor/database/info/interface.py
index 2e5064d..c0ffbf3 100644 (file)
--- a/monitor/database/info/interface.py
+++ b/monitor/database/info/interface.py
@@ -1,4 +1,3 @@
-import bootman                 # debug nodes
 
 from monitor import reboot
 from monitor.common import *
@@ -132,7 +131,6 @@ class SiteInterface(HistorySiteRecord):
                        m = Message(message[0] % args, message[1] % args, viart, self.db.message_id)
 
                        contacts = self.getContacts()
-                       contacts = [config.cc_email]    # TODO: remove after testing...
 
                        print "sending message: %s to site %s for host %s" % (type, self.db.loginbase, hostname)
 
@@ -162,6 +160,7 @@ class SiteInterface(HistorySiteRecord):
                self.db.message_status = "new"
 
        def runBootManager(self, hostname):
+               from monitor import bootman
                print "attempting BM reboot of %s" % hostname
                ret = ""
                try:
@@ -193,6 +192,6 @@ class SiteInterface(HistorySiteRecord):
                act = ActionRecord(loginbase=self.db.loginbase,
                                                        hostname=hostname,
                                                        action='reboot',
-                                                       action_type='first_try_reboot',
+                                                       action_type='try_reboot',
                                                        error_string=err)