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 remote-tracking branch 'refs/remotes/saltstack/2015.8' into 2015.8

Browse source
This commit is contained in:
Gunther Stengl 2015-12-27 15:08:32 +01:00
commit 0c4c8b9b5c
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
salt/modules/win_status.py
View file

@ -203,29 +203,25 @@ def uptime(human_readable=False):
'''
# Open up a subprocess to get information from WMIC
cmd = list2cmdline(['net', 'stats', 'srv'])
cmd = list2cmdline(['wmic', 'os', 'get', 'lastbootuptime'])
outs = __salt__['cmd.run'](cmd)
# Get the line that has when the computer started in it:
stats_line = ''
for line in outs.split('\r\n'):
if "Statistics since" in line:
stats_line = line
# use second line from output
stats_line = outs.split('\r\n')[1]
# Extract the time string from the line and parse
#
# Get string
startup_time = stats_line[len('Statistics Since '):]
# Get string, just use the leading 14 characters
startup_time = stats_line[:14]
# Convert to time struct
try:
startup_time = time.strptime(startup_time, '%d/%m/%Y %H:%M:%S')
except ValueError:
startup_time = time.strptime(startup_time, '%d/%m/%Y %I:%M:%S %p')
startup_time = time.strptime(startup_time, '%Y%m%d%H%M%S')
# Convert to datetime object
startup_time = datetime.datetime(*startup_time[:6])
# Subtract startup time from current time to get the uptime of the system
uptime = datetime.now() - startup_time
uptime = datetime.datetime.now() - startup_time
return str(uptime) if human_readable else uptime.total_seconds()