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

fix: Don't lock the schema during install.php (#7051)

Browse Source
This commit is contained in:
Tony Murray
2017-07-18 14:07:21 -05:00
committed by Neil Lathwood
parent dedfc6c1d8
commit 8e85eebe32
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build-base.php
View File

@@ -25,7 +25,7 @@
*/
if (!isset($init_modules)) {
$opts = getopt('dh:u:p:n:t:s:');
$opts = getopt('ldh:u:p:n:t:s:');
$db_vars = array(
'db_host' => 'h',
@@ -47,6 +47,7 @@ if (!isset($init_modules)) {
require __DIR__ . '/includes/init.php';
$debug = isset($opts['d']);
$skip_schema_lock = isset($opts['l']);
}
require 'includes/sql-schema/update.php';

2
html/includes/output/db-update.inc.php
View File

@@ -40,7 +40,7 @@ $db_vars = array(
'dbsocket' => 's',
);
$cmd = $config['install_dir'] . '/build-base.php';
$cmd = $config['install_dir'] . '/build-base.php -l';
foreach ($db_vars as $var => $opt) {
if ($_SESSION[$var]) {

11
includes/sql-schema/update.php
View File

@@ -18,7 +18,12 @@ if (!isset($init_modules) && php_sapi_name() == 'cli') {
require realpath(__DIR__ . '/../..') . '/includes/init.php';
}
$schemaLock = \LibreNMS\FileLock::lock('schema', 30);
if (isset($skip_schema_lock) && $skip_schema_lock) {
$schemaLock = true;
} else {
$schemaLock = \LibreNMS\FileLock::lock('schema', 30);
}
if ($schemaLock === false) {
echo "Failed to acquire lock, skipping schema update\n";
$return = 1;
@@ -110,5 +115,7 @@ if ($schemaLock === false) {
}
}
$schemaLock->release();
if (is_a($schemaLock, '\LibreNMS\FileLock')) {
$schemaLock->release();
}
}