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

Make installer more responsive

Browse Source 
Update each schema in update.php after applying
Packaged new build.sql bundling all updates up to 067
This commit is contained in:
f0o
2015-09-01 22:42:02 +01:00
parent 87677eabeb
commit 19059412da
4 changed files with 499 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
build-base.php
View File

@@ -13,11 +13,8 @@ if ($sql_fh === false) {
echo 'ERROR: Cannot open SQL build script '.$sql_file."\n";
exit(1);
}
if (is_resource($test_db)) {
$database_link = &$test_db;
} else {
$database_link = mysqli_connect('p:'.$config['db_host'], $config['db_user'], $config['db_pass']);
}
$database_link = mysqli_connect('p:'.$config['db_host'], $config['db_user'], $config['db_pass']);
if ($database_link === false) {
echo 'ERROR: Cannot connect to database: '.mysqli_error($database_link)."\n";
exit(1);
@@ -29,11 +26,26 @@ if ($select === false) {
exit(1);
}
$limit = 0;
while (!feof($sql_fh)) {
$line = fgetss($sql_fh);
if (isset($_SESSION['stage']) ) {
$limit++;
if (isset($_SESSION['offset']) && $limit < $_REQUEST['offset']) {
continue;
}
elseif ( abs($limit-$_REQUEST['offset']) > 6) {
$_SESSION['offset'] = $limit;
echo '<b>Installing, please wait..</b><sub>'.date('r').'</sub><script>window.location.href = "install.php?offset='.$limit.'";</script>';
return;
} else {
echo 'Step #'.$limit.' ...'.PHP_EOL;
}
}
if (!empty($line)) {
$creation = mysqli_query($database_link, $line);
if (!$creation) {
if (!$creation && ($limit <= 100 || $limit > 391) ) {
echo 'WARNING: Cannot execute query ('.$line.'): '.mysqli_error($database_link)."\n";
}
}
@@ -41,4 +53,9 @@ while (!feof($sql_fh)) {
fclose($sql_fh);
require 'includes/sql-schema/update.php';
if( !isset($_SESSION['stage']) ) {
require 'includes/sql-schema/update.php';
} else {
$_SESSION['build-ok'] = true;
dbInsert(array('version' => 67), 'dbSchema');
}