mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
feature: Improved install experience (#6915)
always check that the base sql has been imported. async db building After this merge, we could move install.php to the end of the install documentation. Makes a more natural flow.
This commit is contained in:
committed by
Neil Lathwood
parent
11cce1ff78
commit
f02b551145
@@ -1,53 +1,54 @@
|
||||
#!/usr/bin/env php
|
||||
<?php
|
||||
/**
|
||||
* build-base.php
|
||||
*
|
||||
* Create database structure.
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* @package LibreNMS
|
||||
* @link http://librenms.org
|
||||
* @copyright 2017 Tony Murray
|
||||
* @author Tony Murray <murraytony@gmail.com>
|
||||
*/
|
||||
|
||||
if (!isset($init_modules)) {
|
||||
$opts = getopt('dh:u:p:n:t:s:');
|
||||
|
||||
$db_vars = array(
|
||||
'db_host' => 'h',
|
||||
'db_user' => 'u',
|
||||
'db_pass' => 'p',
|
||||
'db_name' => 'n',
|
||||
'db_port' => 't',
|
||||
'db_socket' => 's',
|
||||
);
|
||||
|
||||
$config = array();
|
||||
foreach ($db_vars as $setting => $opt) {
|
||||
if (isset($opts[$opt])) {
|
||||
$config[$setting] = $opts[$opt];
|
||||
}
|
||||
}
|
||||
|
||||
$init_modules = array();
|
||||
require __DIR__ . '/includes/init.php';
|
||||
|
||||
$options = getopt('d');
|
||||
$debug = isset($options['d']);
|
||||
$debug = isset($opts['d']);
|
||||
}
|
||||
|
||||
if (!isset($sql_file)) {
|
||||
$sql_file = 'build.sql';
|
||||
}
|
||||
|
||||
$sql_fh = fopen($sql_file, 'r');
|
||||
if ($sql_fh === false) {
|
||||
echo 'ERROR: Cannot open SQL build script '.$sql_file.PHP_EOL;
|
||||
exit(1);
|
||||
}
|
||||
|
||||
// only import build.sql to an empty database
|
||||
$tables = dbFetchRows("SHOW TABLES FROM {$config['db_name']}");
|
||||
if (empty($tables)) {
|
||||
$limit = 0;
|
||||
|
||||
while (!feof($sql_fh)) {
|
||||
$line = fgetss($sql_fh);
|
||||
if (isset($_SESSION['stage'])) {
|
||||
$limit++;
|
||||
if (isset($_SESSION['offset']) && $limit < $_REQUEST['offset']) {
|
||||
continue;
|
||||
} elseif (time()-$_SESSION['last'] > 45) {
|
||||
$_SESSION['offset'] = $limit;
|
||||
$GLOBALS['refresh'] = '<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 = dbQuery($line);
|
||||
if (!$creation) {
|
||||
echo 'WARNING: Cannot execute query ('.$line.'): '.mysqli_error($database_link)."\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fclose($sql_fh);
|
||||
|
||||
require 'includes/sql-schema/update.php';
|
||||
|
||||
exit($return);
|
||||
|
Reference in New Issue
Block a user