clearer names for actions, and infer actions better

[monitor.git] / monitor / common.py

diff --git a/monitor/common.py b/monitor/common.py
index 08a6d99..ae32156 100644 (file)
--- a/monitor/common.py
+++ b/monitor/common.py
@@ -207,7 +207,11 @@ def get_nodeset(config):
                l_nodes = api.GetNodes(ng[0]['node_ids'], ['hostname'])
        elif config.site:
                site = api.GetSites(config.site)
-               l_nodes = api.GetNodes(site[0]['node_ids'], ['hostname'])
+               if len(site) > 0:
+                       l_nodes = api.GetNodes(site[0]['node_ids'], ['hostname'])
+               else:
+                       print "No site returned for : %s" % config.site
+                       return []
                
        l_nodes = [node['hostname'] for node in l_nodes]
 
@@ -279,13 +283,13 @@ def found_within(recent_actions, action_type, within):
        return False
        
 
-class Time:
-    @classmethod
-    def dt_to_ts(cls, dt):
-        t = time.mktime(dt.timetuple())
-        return t
-
-    @classmethod
-    def ts_to_dt(cls, ts):
-        d = datetime.fromtimestamp(ts)
-        return d
+#class Time:
+#    @classmethod
+#    def dt_to_ts(cls, dt):
+#        t = time.mktime(dt.timetuple())
+#        return t
+#
+#    @classmethod
+#    def ts_to_dt(cls, ts):
+#        d = datetime.fromtimestamp(ts)
+#        return d