X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Futil%2F__init__.py;h=98802a32517ca3ea07079beee2256ef8396a5f89;hb=45fea95bb898f254ea7e987d7417e9091885fbee;hp=8986f7f402d10c0ee057e9a23d43f4566ea8ccb5;hpb=d8616c5bab940943ef8a17db7937a5eb733dd526;p=monitor.git diff --git a/monitor/util/__init__.py b/monitor/util/__init__.py index 8986f7f..98802a3 100644 --- a/monitor/util/__init__.py +++ b/monitor/util/__init__.py @@ -3,6 +3,9 @@ __all__=["writepid","removepid","daemonize"] import time import math +# import local file.py +import file + def diff_time(timestamp, abstime=True): now = time.time() if timestamp == None: @@ -26,8 +29,8 @@ def diff_time(timestamp, abstime=True): t = diff / (60*60*24) t_str = "%s days ago" % int(math.ceil(t)) elif diff <= 60*60*24*30: # approx sec in month - t = diff / (60*60*24*7) - t_str = "%s wks ago" % int(math.ceil(t)) + t = diff / (60*60*24) + t_str = "%s days ago" % int(math.ceil(t)) elif diff > 60*60*24*30: # approx sec in month t = diff / (60*60*24*30) t_str = "%s mnths ago" % int(t)