saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #49059 from twangboy/fix_37984

Browse source 
Fix docs for status.uptime on Windows
This commit is contained in:
Nicole Thomas 2018-08-10 17:30:38 -04:00 • committed by GitHub
commit 9db6cd5654
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
salt/modules/win_status.py
View file

@ -189,17 +189,29 @@ def uptime(human_readable=False):
'''
.. versionadded:: 2015.8.0
Return the system uptime for this machine in seconds
Return the system uptime for the machine
human_readable : False
If ``True``, then return uptime in years, days, and seconds.
Args:
human_readable (bool):
Return uptime in human readable format if ``True``, otherwise
return seconds. Default is ``False``
.. note::
Human readable format is ``days, hours:min:sec``. Days will only
be displayed if more than 0
Returns:
str:
The uptime in seconds or human readable format depending on the
value of ``human_readable``
CLI Example:
.. code-block:: bash
salt '*' status.uptime
salt '*' status.uptime human_readable=True
salt '*' status.uptime
salt '*' status.uptime human_readable=True
'''
# Get startup time
startup_time = datetime.datetime.fromtimestamp(psutil.boot_time())