fix merge and sleep for interval instead of 1 hour

pull/1936/head
Isaac Connor 2018-03-21 09:28:39 -04:00
parent 0d3957611a
commit c34ab7c172
1 changed files with 2 additions and 3 deletions

View File

@ -85,7 +85,6 @@ while( 1 ) {
my $dbh = zmDbConnect();
# Build the telemetry hash
# We should keep *BSD systems in mind when calling system commands
<<<<<<< HEAD
my %telemetry;
$telemetry{uuid} = getUUID($dbh);
$telemetry{ip} = getIP();
@ -112,10 +111,10 @@ while( 1 ) {
}
zmDbDisconnect();
} elsif ( -t STDIN ) {
print "ZoneMinder Telemetry Agent sleeping for 1 hour because ($now-$lastCheck=$since_last_check > $interval\n";
print "ZoneMinder Telemetry Agent sleeping for $interval seconds because ($now-$lastCheck=$since_last_check > $interval\n";
}
$lastCheck = $now;
sleep(3600);
sleep($interval);
}
print 'ZoneMinder Telemetry Agent exiting at '.strftime('%y/%m/%d %H:%M:%S', localtime())."\n";