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

Use the persistent MySQL connections in install and build-base

Browse Source 
Share mysql-connection from install to build-base
This commit is contained in:
f0o
2015-09-01 20:14:17 +01:00
parent dca3b79a73
commit 87677eabeb
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build-base.php
View File

@@ -13,8 +13,11 @@ if ($sql_fh === false) {
echo 'ERROR: Cannot open SQL build script '.$sql_file."\n";
exit(1);
}
$database_link = mysqli_connect($config['db_host'], $config['db_user'], $config['db_pass']);
if (is_resource($test_db)) {
$database_link = &$test_db;
} else {
$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);

3
html/install.php
View File

@@ -28,6 +28,7 @@ if($stage == "4" || $stage == "3") {
}
require '../includes/defaults.inc.php';
$config['db']['extension']='mysqli';
// Work out the install directory
$cur_dir = explode('/',__DIR__);
$check = end($cur_dir);
@@ -47,7 +48,7 @@ require 'includes/functions.inc.php';
// Check we can connect to MySQL DB, if not, back to stage 1 :)
if($stage == 2) {
$test_db = mysqli_connect($dbhost,$dbuser,$dbpass,$dbname);
$test_db = mysqli_connect('p:'.$dbhost,$dbuser,$dbpass,$dbname);
if(mysqli_connect_error()) {
$stage = 1;
$msg = "Couldn't connect to the database, please check your details<br /> " . mysqli_connect_error();