mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-20 19:36:02 +00:00
32_SYSSTAT.pm: windows uptime fix
git-svn-id: https://svn.fhem.de/fhem/trunk@23971 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
f2f3079405
commit
75e5a345c0
@ -483,7 +483,7 @@ SYSSTAT_Parse($$$)
|
|||||||
my $hours = $uptime % 24;
|
my $hours = $uptime % 24;
|
||||||
my $days = int($uptime / 24);
|
my $days = int($uptime / 24);
|
||||||
|
|
||||||
$uptime = sprintf( "%d days, %d:%.2d", $days, $hours, $minutes);
|
$uptime = sprintf( "%d days, %d:%.2d:%.2d", $days, $hours, $minutes, $seconds);
|
||||||
}
|
}
|
||||||
|
|
||||||
if( $hash->{BlockingResult} ) {
|
if( $hash->{BlockingResult} ) {
|
||||||
@ -630,6 +630,7 @@ SYSSTAT_InitSNMP($)
|
|||||||
-community => AttrVal($name,"snmpCommunity","public"),
|
-community => AttrVal($name,"snmpCommunity","public"),
|
||||||
-port => 161,
|
-port => 161,
|
||||||
-version => AttrVal($name,"snmpVersion",1),
|
-version => AttrVal($name,"snmpVersion",1),
|
||||||
|
-translate => [ -timeticks => 0x0 ],
|
||||||
);
|
);
|
||||||
if( $error ) {
|
if( $error ) {
|
||||||
Log3 $name, 2, "$name: $error";
|
Log3 $name, 2, "$name: $error";
|
||||||
@ -1343,20 +1344,8 @@ SYSSTAT_getUptimeSNMP($)
|
|||||||
my $response = SYSSTAT_readOIDs($hash,\@snmpoids);
|
my $response = SYSSTAT_readOIDs($hash,\@snmpoids);
|
||||||
|
|
||||||
my $uptime = $response->{'.1.3.6.1.2.1.25.1.1.0'};
|
my $uptime = $response->{'.1.3.6.1.2.1.25.1.1.0'};
|
||||||
if( $uptime && $uptime =~ m/(\d+)\s\D+,\s(\d+):(\d+):(\d+)/ ) {
|
if( defined($uptime) ) {
|
||||||
my $days = $1?$1:0;
|
SYSSTAT_Parse($hash, 'cat /proc/uptime', $uptime/100);
|
||||||
my $hours = $2;
|
|
||||||
my $minutes = $3;
|
|
||||||
my $seconds = $4;
|
|
||||||
|
|
||||||
$uptime = $days * 24;
|
|
||||||
$uptime += $hours;
|
|
||||||
$uptime *= 60;
|
|
||||||
$uptime += $minutes;
|
|
||||||
$uptime *= 60;
|
|
||||||
$uptime += $seconds;
|
|
||||||
|
|
||||||
SYSSTAT_Parse($hash, 'cat /proc/uptime', $uptime);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user