mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add another safety-net to remove locks if the execution of poller/disco gets aborted or killed

Browse Source
This commit is contained in:
f0o
2015-09-01 14:49:55 +01:00
parent e11f613bdd
commit 26554221fb
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
discovery.php
View File

@@ -114,6 +114,7 @@ echo PHP_EOL;
foreach (dbFetch("SELECT * FROM `devices` WHERE status = 1 AND disabled = 0 $where ORDER BY device_id DESC") as $device) {
if (dbGetLock('discovering.' . $device['device_id'])) {
register_shutdown_function('dbReleaseLock','discovering.'.$device['device_id']);
discover_device($device, $options);
dbReleaseLock('discovering.' . $device['device_id']);
}

1
poller.php
View File

@@ -118,6 +118,7 @@ if (!isset($query)) {
foreach (dbFetch($query) as $device) {
$device = dbFetchRow("SELECT * FROM `devices` WHERE `device_id` = '".$device['device_id']."'");
if (dbGetLock('polling.' . $device['device_id'])) {
register_shutdown_function('dbReleaseLock','polling.'.$device['device_id']);
poll_device($device, $options);
RunRules($device['device_id']);
echo "\r\n";