From: Stephen Soltesz Date: Mon, 28 Jun 2010 15:47:47 +0000 (+0000) Subject: add a warning when given loginbase returns nothing X-Git-Tag: monitor-3.1-1~18 X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=commitdiff_plain;h=9ea68bf1063d34520a3339f16e53f50db98369b9 add a warning when given loginbase returns nothing add two time functions to convert strings to timestamp or datetime objects --- diff --git a/monitor/common.py b/monitor/common.py index 78ca093..178c8b2 100644 --- 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] @@ -290,4 +294,12 @@ class Time: d = datetime.fromtimestamp(ts) return d + @classmethod + def str_to_dt(cls, date_str, format="%Y-%m-%d %H:%M:%S"): + dt = datetime.strptime(date_str[:date_str.find('.')], format) + return dt + @classmethod + def str_to_ts(cls, date_str, format="%Y-%m-%d %H:%M:%S"): + ts = time.mktime(time.strptime(date_str[:date_str.find('.')], format)) + return ts