mirror of
https://github.com/librenms/librenms.git
synced 2024-09-22 10:58:42 +00:00
Merge pull request #1822 from f0o/mysql-lock-release
Release MySQL locks when they are not used anymore
This commit is contained in:
commit
ce3dfd6d42
@ -108,6 +108,7 @@ if ($config['distributed_poller'] === true) {
|
||||
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'])) {
|
||||
discover_device($device, $options);
|
||||
dbReleaseLock('discovering.' . $device['device_id']);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -96,6 +96,8 @@ if (!dbGetLock('schema_update')) {
|
||||
exit(1);
|
||||
} //end if
|
||||
|
||||
register_shutdown_function('dbReleaseLock','schema_update');
|
||||
|
||||
do {
|
||||
sleep(1);
|
||||
} while (@dbFetchCell('SELECT COUNT(*) FROM `devices` WHERE NOT IS_FREE_LOCK(CONCAT("polling.", device_id)) OR NOT IS_FREE_LOCK(CONCAT("queued.", device_id)) OR NOT IS_FREE_LOCK(CONCAT("discovering.", device_id))') > 0);
|
||||
@ -134,7 +136,7 @@ foreach ($filelist as $file) {
|
||||
if ($config['db']['extension'] == 'mysqli') {
|
||||
echo mysqli_error($database_link)."\n";
|
||||
}
|
||||
else {
|
||||
else {
|
||||
echo mysql_error()."\n";
|
||||
}
|
||||
}
|
||||
@ -169,5 +171,3 @@ if ($updating) {
|
||||
|
||||
echo "-- Done\n";
|
||||
}
|
||||
|
||||
dbReleaseLock('schema_update');
|
||||
|
@ -114,6 +114,7 @@ foreach (dbFetch($query) as $device) {
|
||||
poll_device($device, $options);
|
||||
RunRules($device['device_id']);
|
||||
echo "\r\n";
|
||||
dbReleaseLock('polling.' . $device['device_id']);
|
||||
}
|
||||
$polled_devices++;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user