safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

run psql in quiet mode unless 'verbose' is enabled

Browse Source
This commit is contained in:
Sarah Hoffmann
2017-09-17 11:34:35 +02:00
parent 3546b30473
commit 5614ece9a1
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/setup.php
View File

@@ -689,12 +689,16 @@ if (!$bDidSomething) {
function pgsqlRunScriptFile($sFilename) function pgsqlRunScriptFile($sFilename)
{ {
global $aCMDResult;
if (!file_exists($sFilename)) fail('unable to find '.$sFilename); if (!file_exists($sFilename)) fail('unable to find '.$sFilename);
// Convert database DSN to psql parameters // Convert database DSN to psql parameters
$aDSNInfo = DB::parseDSN(CONST_Database_DSN); $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432; if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
$sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database']; $sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database'];
if (!$aCMDResult['verbose']) {
$sCMD .= ' -q';
}
$ahGzipPipes = null; $ahGzipPipes = null;
if (preg_match('/\\.gz$/', $sFilename)) { if (preg_match('/\\.gz$/', $sFilename)) {
@@ -745,6 +749,9 @@ function pgsqlRunScript($sScript, $bfatal = true)
$aDSNInfo = DB::parseDSN(CONST_Database_DSN); $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432; if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
$sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database']; $sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database'];
if (!$aCMDResult['verbose']) {
$sCMD .= ' -q';
}
if ($bfatal && !$aCMDResult['ignore-errors']) if ($bfatal && !$aCMDResult['ignore-errors'])
$sCMD .= ' -v ON_ERROR_STOP=1'; $sCMD .= ' -v ON_ERROR_STOP=1';
$aDescriptors = array( $aDescriptors = array(