x/cloud-init
Code Issues Proposed changes

fix: Log the used method as well.

Browse Source
This commit is contained in:
Harm Weites 2013-12-14 17:38:04 +00:00
parent 4943536a14
commit e6bf1b3b1d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cloudinit/util.py
View File

@ -1418,12 +1418,15 @@ def time_rfc2822():
def uptime(): def uptime():
uptime_str = '??' uptime_str = '??'
method = 'unknown'
try: try:
if os.path.exists("/proc/uptime"): if os.path.exists("/proc/uptime"):
method = '/proc/uptime'
contents = load_file("/proc/uptime").strip() contents = load_file("/proc/uptime").strip()
if contents: if contents:
uptime_str = contents.split()[0] uptime_str = contents.split()[0]
else: else:
method = 'ctypes'
libc = ctypes.CDLL('/lib/libc.so.7') libc = ctypes.CDLL('/lib/libc.so.7')
size = ctypes.c_size_t() size = ctypes.c_size_t()
buf = ctypes.c_int() buf = ctypes.c_int()
@ -1434,7 +1437,7 @@ def uptime():
uptime_str = now - bootup uptime_str = now - bootup
except: except:
logexc(LOG, "Unable to read uptime") logexc(LOG, "Unable to read uptime using method: %s" % method)
return uptime_str return uptime_str