2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 01:09:47 +00:00

changed uptime format

git-svn-id: https://svn.fhem.de/fhem/trunk@3556 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2013-07-31 08:35:29 +00:00
parent 8b96b05404
commit 5697696594

View File

@ -61,7 +61,7 @@ SYSSTAT_Define($$)
return undef; return undef;
} }
sub sub
SYSSTAT_InitSys( $ ) SYSSTAT_InitSys($)
{ {
my ($hash) = @_; my ($hash) = @_;
@ -146,8 +146,9 @@ SYSSTAT_Attr($$$)
return; return;
} }
sub SYSSTAT_getLoadAVG( $ ); sub SYSSTAT_getLoadAVG($);
sub SYSSTAT_getPiTemp( $ ); sub SYSSTAT_getPiTemp($);
sub SYSSTAT_getUptime($);
sub sub
SYSSTAT_GetUpdate($) SYSSTAT_GetUpdate($)
{ {
@ -233,7 +234,7 @@ SYSSTAT_GetUpdate($)
} }
sub sub
SYSSTAT_getLoadAVG( $ ) SYSSTAT_getLoadAVG($ )
{ {
my ($hash) = @_; my ($hash) = @_;
@ -328,7 +329,7 @@ SYSSTAT_readFile($$$)
} }
sub sub
SYSSTAT_getPiTemp( $ ) SYSSTAT_getPiTemp($)
{ {
my ($hash) = @_; my ($hash) = @_;
@ -338,7 +339,7 @@ SYSSTAT_getPiTemp( $ )
} }
sub sub
SYSSTAT_getPiFreq( $ ) SYSSTAT_getPiFreq($)
{ {
my ($hash) = @_; my ($hash) = @_;
@ -348,13 +349,14 @@ SYSSTAT_getPiFreq( $ )
} }
sub sub
SYSSTAT_getUptime( $ ) SYSSTAT_getUptime($)
{ {
my ($hash) = @_; my ($hash) = @_;
my $uptime = SYSSTAT_readCmd($hash,"uptime",0); my $uptime = SYSSTAT_readCmd($hash,"uptime",0);
$uptime = $1 if( $uptime =~ m/up\s+([\d:]*)/ ); $uptime = $1 if( $uptime =~ m/up\s((\d+\D+,\s)?[\d:]+)/ );
$uptime = "0 days, $uptime" if( !$2);
return $uptime; return $uptime;
} }