Datatype fix in db_get_lock, updated classmap
This commit is contained in:
parent
2fe6092d37
commit
cb8fcca0e9
|
@ -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;
|
||||
|
|
|
@ -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',
|
||||
|
|
|
@ -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',
|
||||
|
|
Loading…
Reference in New Issue