From cb8fcca0e92edf3885fd54910a06ca0d2b1f62b2 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Thu, 24 Jun 2021 13:04:45 +0200 Subject: [PATCH] Datatype fix in db_get_lock, updated classmap --- pandora_console/include/functions_db.php | 8 ++++++-- pandora_console/vendor/composer/autoload_classmap.php | 1 + pandora_console/vendor/composer/autoload_static.php | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index 3231c68675..b7c4374f2f 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -2228,7 +2228,7 @@ function db_is_free_lock($lockname) * 0 - already locked by another process. * NULL: something really bad happened */ -function db_get_lock($lockname, $expiration_time=86400) +function db_get_lock(string $lockname, int $expiration_time=86400) :?int { global $config; @@ -2253,7 +2253,11 @@ function db_get_lock($lockname, $expiration_time=86400) ); $config['dbcache'] = $cache; - return $lock_status; + if ($lock_status === false) { + return null; + } + + return (int) $lock_status; } $config['dbcache'] = $cache; diff --git a/pandora_console/vendor/composer/autoload_classmap.php b/pandora_console/vendor/composer/autoload_classmap.php index b705aec40a..15ab0db710 100644 --- a/pandora_console/vendor/composer/autoload_classmap.php +++ b/pandora_console/vendor/composer/autoload_classmap.php @@ -322,6 +322,7 @@ return array( 'PandoraFMS\\Enterprise\\ClusterViewer\\ClusterManager' => $baseDir . '/enterprise/include/lib/ClusterViewer/ClusterManager.php', 'PandoraFMS\\Enterprise\\ClusterViewer\\ClusterWizard' => $baseDir . '/enterprise/include/lib/ClusterViewer/ClusterWizard.php', 'PandoraFMS\\Enterprise\\Metaconsole\\MergeQueue' => $baseDir . '/enterprise/include/lib/Metaconsole/MergeQueue.php', + 'PandoraFMS\\Enterprise\\Metaconsole\\MergeQueuePlan' => $baseDir . '/enterprise/include/lib/Metaconsole/MergeQueuePlan.php', 'PandoraFMS\\Enterprise\\Metaconsole\\Node' => $baseDir . '/enterprise/include/lib/Metaconsole/Node.php', 'PandoraFMS\\Enterprise\\Metaconsole\\PriorityPlan' => $baseDir . '/enterprise/include/lib/Metaconsole/PriorityPlan.php', 'PandoraFMS\\Enterprise\\Metaconsole\\SyncQueue' => $baseDir . '/enterprise/include/lib/Metaconsole/SyncQueue.php', diff --git a/pandora_console/vendor/composer/autoload_static.php b/pandora_console/vendor/composer/autoload_static.php index 8fdd3adc5f..8e924abb25 100644 --- a/pandora_console/vendor/composer/autoload_static.php +++ b/pandora_console/vendor/composer/autoload_static.php @@ -396,6 +396,7 @@ class ComposerStaticInitfdecadadce22e6dde51e9535fe4ad7aa 'PandoraFMS\\Enterprise\\ClusterViewer\\ClusterManager' => __DIR__ . '/../..' . '/enterprise/include/lib/ClusterViewer/ClusterManager.php', 'PandoraFMS\\Enterprise\\ClusterViewer\\ClusterWizard' => __DIR__ . '/../..' . '/enterprise/include/lib/ClusterViewer/ClusterWizard.php', 'PandoraFMS\\Enterprise\\Metaconsole\\MergeQueue' => __DIR__ . '/../..' . '/enterprise/include/lib/Metaconsole/MergeQueue.php', + 'PandoraFMS\\Enterprise\\Metaconsole\\MergeQueuePlan' => __DIR__ . '/../..' . '/enterprise/include/lib/Metaconsole/MergeQueuePlan.php', 'PandoraFMS\\Enterprise\\Metaconsole\\Node' => __DIR__ . '/../..' . '/enterprise/include/lib/Metaconsole/Node.php', 'PandoraFMS\\Enterprise\\Metaconsole\\PriorityPlan' => __DIR__ . '/../..' . '/enterprise/include/lib/Metaconsole/PriorityPlan.php', 'PandoraFMS\\Enterprise\\Metaconsole\\SyncQueue' => __DIR__ . '/../..' . '/enterprise/include/lib/Metaconsole/SyncQueue.php',