fix verbose flag for PHP wrapper scripts

The flag must come after the command.

diff --git a/lib-php/admin/setup.php b/lib-php/admin/setup.php
index 3aa6b828d15c336e102018a4c6cb6f4774a6171d..f8e360bb59f3f086f2af45131a8fa827aad03caf 100644 (file)
--- a/lib-php/admin/setup.php
+++ b/lib-php/admin/setup.php
@@ -57,23 +57,24 @@ setupHTTPProxy();
 $bDidSomething = false;
 
 $oNominatimCmd = new \Nominatim\Shell(getSetting('NOMINATIM_TOOL'));
-if (isset($aCMDResult['quiet']) && $aCMDResult['quiet']) {
-    $oNominatimCmd->addParams('--quiet');
-}
-if ($aCMDResult['verbose']) {
-    $oNominatimCmd->addParams('--verbose');
-}
 
 // by default, use all but one processor, but never more than 15.
 $iInstances = max(1, $aCMDResult['threads'] ?? (min(16, getProcessorCount()) - 1));
 
-function run($oCmd) {
+function run($oCmd)
+{
     global $iInstances;
     global $aCMDResult;
     $oCmd->addParams('--threads', $iInstances);
     if ($aCMDResult['ignore-errors'] ?? false) {
         $oCmd->addParams('--ignore-errors');
     }
+    if ($aCMDResult['quiet'] ?? false) {
+        $oCmd->addParams('--quiet');
+    }
+    if ($aCMDResult['verbose'] ?? false) {
+        $oCmd->addParams('--verbose');
+    }
     $oCmd->run(true);
 }
 

diff --git a/lib-php/admin/update.php b/lib-php/admin/update.php
index 4f639c8d5b262b697b4250f59bf98703452a42e0..81e0b832100acddc462d384a5158637224e21c09 100644 (file)
--- a/lib-php/admin/update.php
+++ b/lib-php/admin/update.php
@@ -104,11 +104,17 @@ if ($fPostgresVersion >= 11.0) {
 }
 
 $oNominatimCmd = new \Nominatim\Shell(getSetting('NOMINATIM_TOOL'));
-if ($aResult['quiet']) {
-    $oNominatimCmd->addParams('--quiet');
-}
-if ($aResult['verbose']) {
-    $oNominatimCmd->addParams('--verbose');
+
+function run($oCmd)
+{
+    global $aCMDResult;
+    if ($aCMDResult['quiet'] ?? false) {
+        $oCmd->addParams('--quiet');
+    }
+    if ($aCMDResult['verbose'] ?? false) {
+        $oCmd->addParams('--verbose');
+    }
+    $oCmd->run(true);
 }
 
 
@@ -119,7 +125,7 @@ if ($aResult['init-updates']) {
         $oCmd->addParams('--no-update-functions');
     }
 
-    $oCmd->run();
+    run($oCmd);
 }
 
 if ($aResult['check-for-updates']) {
@@ -147,7 +153,7 @@ if (isset($aResult['import-diff']) || isset($aResult['import-file'])) {
 }
 
 if ($aResult['calculate-postcodes']) {
-    (clone($oNominatimCmd))->addParams('refresh', '--postcodes')->run();
+    run((clone($oNominatimCmd))->addParams('refresh', '--postcodes'));
 }
 
 $sTemporaryFile = CONST_InstallDir.'/osmosischange.osc';
@@ -196,22 +202,21 @@ if ($bHaveDiff) {
 }
 
 if ($aResult['recompute-word-counts']) {
-    (clone($oNominatimCmd))->addParams('refresh', '--word-counts')->run();
+    run((clone($oNominatimCmd))->addParams('refresh', '--word-counts'));
 }
 
 if ($aResult['index']) {
-    (clone $oNominatimCmd)
+    run((clone $oNominatimCmd)
         ->addParams('index', '--minrank', $aResult['index-rank'])
-        ->addParams('--threads', $aResult['index-instances'])
-        ->run();
+        ->addParams('--threads', $aResult['index-instances']));
 }
 
 if ($aResult['update-address-levels']) {
-    (clone($oNominatimCmd))->addParams('refresh', '--address-levels')->run();
+    run((clone($oNominatimCmd))->addParams('refresh', '--address-levels'));
 }
 
 if ($aResult['recompute-importance']) {
-    (clone($oNominatimCmd))->addParams('refresh', '--importance')->run(true);
+    run((clone($oNominatimCmd))->addParams('refresh', '--importance'));
 }
 
 if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
@@ -227,5 +232,5 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
         $oCmd->addParams('--no-index');
     }
 
-    exit($oCmd->run());
+    run($oCmd);
 }

diff --git a/nominatim/db/utils.py b/nominatim/db/utils.py
index 0490bbc869fe3f19a4bc87eac2fbed73d4b54d6f..6d2eb297a1df7d4dbfe20f480dc7ffe88da85b8b 100644 (file)
--- a/nominatim/db/utils.py
+++ b/nominatim/db/utils.py
@@ -31,6 +31,8 @@ def execute_file(dsn, fname, ignore_errors=False, pre_code=None, post_code=None)
     cmd = ['psql']
     if not ignore_errors:
         cmd.extend(('-v', 'ON_ERROR_STOP=1'))
+    if not LOG.isEnabledFor(logging.INFO):
+        cmd.append('--quiet')
     proc = subprocess.Popen(cmd, env=get_pg_env(dsn), stdin=subprocess.PIPE)
 
     if not LOG.isEnabledFor(logging.INFO):