nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 00:24:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert all PHP-Based MySQL Locks introduced in #1584

Browse Source
This commit is contained in:
f0o
2015-09-02 14:46:42 +01:00
parent bc3916df2c
commit da9e071d7d
5 changed files with 4 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/dbFacile.mysql.php
-30
View File
@@ -59,36 +59,6 @@ function dbQuery($sql, $parameters=array()) {
}//end dbQuery()
/*
* Aquire a lock on a string
* */
function dbGetLock($data, $timeout = 0) {
$sql = 'SELECT GET_LOCK(\'' . $data . '\',' . $timeout . ')';
$result = dbFetchCell($sql);
return $result;
}
/*
* Check a lock on a string
* */
function dbCheckLock($data) {
$sql = 'SELECT IS_FREE_LOCK(\'' . $data . '\')';
$result = dbFetchCell($sql);
return $result;
}
/*
* Release a lock on a string
* */
function dbReleaseLock($data) {
$sql = 'SELECT RELEASE_LOCK(\'' . $data . '\')';
$result = dbFetchCell($sql);
return $result;
}
/*
* Passed an array and a table name, it attempts to insert the data into the table.
* Check for boolean false to determine whether insert failed
includes/dbFacile.mysqli.php
-29
View File
@@ -59,35 +59,6 @@ function dbQuery($sql, $parameters=array()) {
}//end dbQuery()
/*
* Aquire a lock on a string
* */
function dbGetLock($data, $timeout = 0) {
$sql = 'SELECT GET_LOCK(\'' . $data . '\',' . $timeout . ')';
$result = dbFetchCell($sql);
return $result;
}
/*
* Check a lock on a string
* */
function dbCheckLock($data) {
$sql = 'SELECT IS_FREE_LOCK(\'' . $data . '\')';
$result = dbFetchCell($sql);
return $result;
}
/*
* Release a lock on a string
* */
function dbReleaseLock($data) {
$sql = 'SELECT RELEASE_LOCK(\'' . $data . '\')';
$result = dbFetchCell($sql);
return $result;
}
/*
* Passed an array and a table name, it attempts to insert the data into the table.
* Check for boolean false to determine whether insert failed
includes/sql-schema/update.php
-8
View File
@@ -91,13 +91,6 @@ if ($tmp[0] <= $db_rev) {
return;
}
if (!dbGetLock('schema_update')) {
echo "Schema update already in progress. Exiting\n";
exit(1);
} //end if
register_shutdown_function('dbReleaseLock','schema_update');
foreach ($filelist as $file) {
list($filename,$extension) = explode('.', $file, 2);
if ($filename > $db_rev) {
@@ -168,4 +161,3 @@ if ($updating) {
echo "-- Done\n";
}
dbReleaseLock('schema_update');