valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

status.uptime falls back to using uptime binary on systems lacking /proc/uptime like Solaris, OpenBSD,...

Browse Source
This commit is contained in:
Jorge Schrauwen 2016-08-22 22:39:45 +02:00
parent 44cbfbbecc
commit 6a049e142a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/modules/status.py
View File

@ -139,6 +139,8 @@ def uptime():
The uptime function was changed to return a dictionary of easy-to-read
key/value pairs containing uptime information, instead of the output
from a ``cmd.run`` call.
.. versionchanged:: carbon
Fall back to output of `uptime` when /proc/uptime is not available.
CLI Example:
@ -148,7 +150,12 @@ def uptime():
'''
ut_path = "/proc/uptime"
if not os.path.exists(ut_path):
raise CommandExecutionError("File {ut_path} was not found.".format(ut_path=ut_path))
if __grains__['kernel'] == 'Linux':
raise CommandExecutionError("File {ut_path} was not found.".format(ut_path=ut_path))
elif not salt.utils.which('uptime'):
raise CommandExecutionError("No uptime binary available.")
else:
return __salt__['cmd.run']('uptime')
ut_ret = {
'seconds': int(float(open(ut_path).read().strip().split()[0]))