removed print statements

moved default port for webmon

diff --git a/bootman.py b/bootman.py
index 92f4ffe..c283f6a 100755 (executable)
--- a/bootman.py
+++ b/bootman.py
@@ -811,7 +811,7 @@ def reboot(hostname, config=None, forced_action=None):
 # MAIN -------------------------------------------------------------------
 
 def main():
-       import parser as parsermodule
+       from monitor import parser as parsermodule
        parser = parsermodule.getParser()
 
        parser.set_defaults(child=False, collect=False, nosetup=False, verbose=False, 

diff --git a/findbad.py b/findbad.py
index 9b348bb..7bb31a0 100755 (executable)
--- a/findbad.py
+++ b/findbad.py
@@ -8,7 +8,7 @@ from datetime import datetime,timedelta
 import threadpool
 import threading
 
-from monitor import util
+from monitor.util import file
 from monitor.util import command
 from monitor import config
 
@@ -111,7 +111,7 @@ def main():
        #cohash = cotop.coget(cotop_url)
        l_nodes = plccache.l_nodes
        if config.nodelist:
-               f_nodes = util.file.getListFromFile(config.nodelist)
+               f_nodes = file.getListFromFile(config.nodelist)
                l_nodes = filter(lambda x: x['hostname'] in f_nodes, l_nodes)
        elif config.node:
                f_nodes = [config.node]

diff --git a/getconf.py b/getconf.py
index 32641fb..ad8f9a7 100755 (executable)
--- a/getconf.py
+++ b/getconf.py
@@ -18,6 +18,9 @@ def getconf(hostname, force=False, media=None):
                print "cd bootcd; ./build.sh -f %s.txt -t usb_partition -o /plc/data/var/www/html/bootcds/%s-partition.usb &> /dev/null" % ( hostname, hostname)
                print os.system("cd bootcd; ./build.sh -f %s.txt -t usb_partition -o /plc/data/var/www/html/bootcds/%s-partition.usb &> /dev/null" % ( hostname, hostname))
        else:
+               #print os.system("cd bootcd; ./build.sh -f %s.txt -t iso -o /plc/data/var/www/html/bootcds/%s.iso &> /dev/null" % ( hostname, hostname))
+               print "cd bootcd; ./build.sh -f %s.txt -t usb_partition -o /plc/data/var/www/html/bootcds/%s-partition.usb &> /dev/null" % ( hostname, hostname)
+               #print os.system("cd bootcd; ./build.sh -f %s.txt -t usb_partition -o /plc/data/var/www/html/bootcds/%s-partition.usb &> /dev/null" % ( hostname, hostname))
                # assume that the images have already been generated..
                pass
 

diff --git a/monitor/database/dbpickle.py b/monitor/database/dbpickle.py
index 074ff68..5afc733 100644 (file)
--- a/monitor/database/dbpickle.py
+++ b/monitor/database/dbpickle.py
@@ -119,7 +119,7 @@ class SPickle:
                Otherwise, it's normal mode, if the file doesn't exist, raise error
                Load the file
                """
-               print "loading %s" % name
+               #print "loading %s" % name
 
                if config.debug:
                        if self.exists("debug.%s" % name, type):

diff --git a/monitor/parser.py b/monitor/parser.py
index ac26cd6..5f79f74 100644 (file)
--- a/monitor/parser.py
+++ b/monitor/parser.py
@@ -117,7 +117,7 @@ def getParser(parsesets=[], parser=None):
                p = parseSetDefaults(p)
 
        return p
-       
+
 def parse_args(parser):
        class obj: pass
        (options, args) = parser.parse_args()
@@ -133,7 +133,7 @@ def print_values(parser):
        for key in parser.__dict__.keys():
                if key not in exclude:
                        print "%20s == %s" % (key, parser.__dict__[key])
-       
+
 def usage(parser):
        print_values(parser)
        parser.print_help()

diff --git a/monitor/wrapper/plccache.py b/monitor/wrapper/plccache.py
index 96b5646..3efd791 100755 (executable)
--- a/monitor/wrapper/plccache.py
+++ b/monitor/wrapper/plccache.py
@@ -146,5 +146,5 @@ def create_plcdb():
 if __name__ == '__main__':
        create_plcdb()
 else:
-       print "calling plccache init()"
+       #print "calling plccache init()"
        init()

diff --git a/web/MonitorWeb/dev.cfg b/web/MonitorWeb/dev.cfg
index 00d162f..74cfff6 100644 (file)
--- a/web/MonitorWeb/dev.cfg
+++ b/web/MonitorWeb/dev.cfg
@@ -32,7 +32,7 @@ autoreload.package="monitorweb"
 
 
 server.socket_host="monitor.planet-lab.org"
-server.socket_port=8080
+server.socket_port=8082
 #server.webpath="/monitor/"
 #base_url_filter.on = False
 #base_url_filter.base_url = "http://127.0.0.1:8080/monitor"

diff --git a/web/MonitorWeb/prod.cfg b/web/MonitorWeb/prod.cfg
index a2aac87..c9062b4 100644 (file)
--- a/web/MonitorWeb/prod.cfg
+++ b/web/MonitorWeb/prod.cfg
@@ -31,7 +31,7 @@ autoreload.package="monitorweb"
 
 
 server.socket_host="127.0.0.1"
-server.socket_port=8080
+server.socket_port=8082
 base_url_filter.on = False
 base_url_filter.use_x_forwarded_host = True
 

diff --git a/zabbix/zabbixsite.py b/zabbix/zabbixsite.py
index 8c9892d..5ff964f 100755 (executable)
--- a/zabbix/zabbixsite.py
+++ b/zabbix/zabbixsite.py
@@ -161,7 +161,7 @@ def setup_site(loginbase, techemail, piemail, iplist):
 
        BI_WEEKLY_ESC_PERIOD = int(60*60*24)
        DISCOVERY_DELAY = 3600
-       BI_WEEKLY_ESC_PERIOD = int(45*60) # testing...
+       BI_WEEKLY_ESC_PERIOD = int(300)
        DISCOVERY_DELAY = 240 # testing
 
        # User Group
@@ -312,13 +312,13 @@ def setup_site(loginbase, techemail, piemail, iplist):
                                        objectid=site_user_group.usrgrpid, 
                                        esc_period=0, esc_step_to=3, esc_step_from=3, 
                                        operationcondition_list=[ OperationConditionNotAck() ] ),
-                               ActionOperation(operationtype=defines.OPERATION_TYPE_MESSAGE,
-                                       shortdata=mailtxt.nodedown_one_subject,
-                                       longdata=mailtxt.nodedown_one,
-                                       object=defines.OPERATION_OBJECT_GROUP, 
-                                       objectid=site_user_group.usrgrpid, 
-                                       esc_period=0, esc_step_to=7, esc_step_from=7, 
-                                       operationcondition_list=[ OperationConditionNotAck() ] ),
+                               #ActionOperation(operationtype=defines.OPERATION_TYPE_MESSAGE,
+                               #       shortdata=mailtxt.nodedown_one_subject,
+                               #       longdata=mailtxt.nodedown_one,
+                               #       object=defines.OPERATION_OBJECT_GROUP, 
+                               #       objectid=site_user_group.usrgrpid, 
+                               #       esc_period=0, esc_step_to=7, esc_step_from=7, 
+                               #       operationcondition_list=[ OperationConditionNotAck() ] ),
                                # STAGE 2
                                ActionOperation(operationtype=defines.OPERATION_TYPE_COMMAND, 
                                        esc_step_from=10, esc_step_to=10, 
@@ -334,14 +334,14 @@ def setup_site(loginbase, techemail, piemail, iplist):
                                        object=defines.OPERATION_OBJECT_GROUP, 
                                        objectid=site_user_group.usrgrpid, 
                                        operationcondition_list=[ OperationConditionNotAck() ] ), 
-                               ActionOperation(operationtype=defines.OPERATION_TYPE_MESSAGE, 
-                                       shortdata=mailtxt.nodedown_two_subject,
-                                       longdata=mailtxt.nodedown_two,
-                                       esc_step_from=14, esc_step_to=14, 
-                                       esc_period=0, 
-                                       object=defines.OPERATION_OBJECT_GROUP, 
-                                       objectid=site_user_group.usrgrpid, 
-                                       operationcondition_list=[ OperationConditionNotAck() ] ), 
+                               #ActionOperation(operationtype=defines.OPERATION_TYPE_MESSAGE, 
+                               #       shortdata=mailtxt.nodedown_two_subject,
+                               #       longdata=mailtxt.nodedown_two,
+                               #       esc_step_from=14, esc_step_to=14, 
+                               #       esc_period=0, 
+                               #       object=defines.OPERATION_OBJECT_GROUP, 
+                               #       objectid=site_user_group.usrgrpid, 
+                               #       operationcondition_list=[ OperationConditionNotAck() ] ), 
 
                                # STAGE 3
                                ActionOperation(operationtype=defines.OPERATION_TYPE_COMMAND,