X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Futil%2F__init__.py;h=c5a3dfdb1adc2b18ca5764f2732b0a1697434b7a;hb=fbe2fbd7f5d866205f878e68968dcef14a3812ab;hp=8986f7f402d10c0ee057e9a23d43f4566ea8ccb5;hpb=d8616c5bab940943ef8a17db7937a5eb733dd526;p=monitor.git diff --git a/monitor/util/__init__.py b/monitor/util/__init__.py index 8986f7f..c5a3dfd 100644 --- a/monitor/util/__init__.py +++ b/monitor/util/__init__.py @@ -1,8 +1,10 @@ -__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 +28,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)