SSH and telnet library

[monitor.git] / comon.py

diff --git a/comon.py b/comon.py
index a380dcb..f547230 100755 (executable)
--- a/comon.py
+++ b/comon.py
@@ -40,7 +40,6 @@ class Comon(Thread):
                        "ssh": "sshstatus%20%3E%202h",
                        "clock_drift": "drift%20%3E%201m",
                        "dns": "dns1udp%20%3E%2080%20&&%20dns2udp%20%3E%2080",
-                       "disk": "resptime%20%3E%200%20&&%20gbfree%20%3C%205",
                        "filerw": "filerw%3E0",
                        "dbg" : "keyok==0"}
                Thread.__init__(self)
@@ -66,6 +65,7 @@ class Comon(Thread):
        # Update individual buckekts.  Hostnames only.
        def updatebkts(self):
                for (bkt,url) in self.comonbkts.items():
+                       logger.debug("COMON:  Updating bucket %s" % bkt)
                        tmp = self.coget(COMONURL + "&format=formatcsv&select='" + url + "'").keys()
                        setattr(self, bkt, tmp)
 
@@ -79,7 +79,6 @@ class Comon(Thread):
        def coget(self,url):
                rawdata = None
                try:
-                       logger.debug("Trying - " + url)
                        coserv = urllib2.Request(url)
                        coserv.add_header('User-Agent',
                                'PL_Monitor +http://monitor.planet-lab.org/')