Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / blocks.php

diff --git a/utils/blocks.php b/utils/blocks.php
index d2db17f0e9478b60e9dbc8e9f9faf8cb3a8e6c1b..b213e4545d9774a5872f4c764a4e0ff652a90934 100755 (executable)
--- a/utils/blocks.php
+++ b/utils/blocks.php
@@ -1,44 +1,55 @@
 #!/usr/bin/php -Cq
 <?php
 
 #!/usr/bin/php -Cq
 <?php
 

-        require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
-        ini_set('memory_limit', '800M');
+require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+require_once(CONST_BasePath.'/lib/init-cmd.php');
+ini_set('memory_limit', '800M');

 
 

-       $aCMDOptions = array(
-               "Manage service blocks / restrictions",
-               array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
-               array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
-               array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
-               array('list', 'l', 0, 1, 0, 0, 'bool', 'List recent blocks'),
-               array('delete', 'd', 0, 1, 0, 0, 'bool', 'Clear recent blocks list'),
-       );
-       getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
+$aCMDOptions
+ = array(
+    "Manage service blocks / restrictions",
+    array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
+    array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
+    array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
+    array('list', 'l', 0, 1, 0, 0, 'bool', 'List recent blocks'),
+    array('delete', 'd', 0, 1, 0, 0, 'bool', 'Clear recent blocks list'),
+    array('flush', '', 0, 1, 0, 0, 'bool', 'Flush all blocks / stats'),
+   );
+getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);

 
 

-       $m = getBucketMemcache();
-        if (!$m)
-       {
-               echo "ERROR: Bucket memcache is not configured\n";
-               exit;
-       }
+$m = getBucketMemcache();
+if (!$m) {
+    echo "ERROR: Bucket memcache is not configured\n";
+    exit;
+}

 
 

-       if ($aResult['list'])
-       {
-               $iCurrentSleeping = $m->get('sleepCounter');
-               echo "\n Sleeping blocks count: $iCurrentSleeping\n";
+if ($aResult['list']) {
+    $iCurrentSleeping = $m->get('sleepCounter');
+    echo "\n Sleeping blocks count: $iCurrentSleeping\n";

 
 

-               $aBlocks = getBucketBlocks();
-               echo "\n";
-               printf(" %-40s | %12s | %7s | %13s | %16s | %31s\n", "Key", "Total Blocks", "Current", "Still Blocked", "Last Req Blocked", "Last Block Time");
-               printf(" %'--40s-|-%'-12s-|-%'-7s-|-%'-13s-|-%'-16s-|-%'-31s\n", "", "", "", "", "", "");
-               foreach($aBlocks as $sKey => $aDetails)
-               {
-                       printf(" %-40s | %12s | %7s | %13s | %16s | %31s\n", $sKey, $aDetails['totalBlocks'], (int)$aDetails['currentBucketSize'], $aDetails['lastRequestBlocked']?'Y':'N', $aDetails['currentlyBlocked']?'Y':'N', date("r", $aDetails['lastBlockTimestamp']));
-               }
-               echo "\n";
-       }
+    $aBlocks = getBucketBlocks();
+    echo "\n";
+    printf(" %-40s | %12s | %7s | %13s | %31s | %8s\n", "Key", "Total Blocks", "Current", "Still Blocked", "Last Block Time", "Sleeping");
+    printf(" %'--40s-|-%'-12s-|-%'-7s-|-%'-13s-|-%'-31s-|-%'-8s\n", "", "", "", "", "", "");
+    foreach ($aBlocks as $sKey => $aDetails) {
+        printf(
+            " %-40s | %12s | %7s | %13s | %31s | %8s\n",
+            $sKey,
+            $aDetails['totalBlocks'],
+            (int)$aDetails['currentBucketSize'],
+            $aDetails['currentlyBlocked']?'Y':'N',
+            date("r", $aDetails['lastBlockTimestamp']),
+            $aDetails['isSleeping']?'Y':'N'
+        );
+    }
+    echo "\n";
+}

 
 

-       if ($aResult['delete'])
-       {
-               $m->set('sleepCounter', 0);
-               clearBucketBlocks();
-       }
+if ($aResult['delete']) {
+    $m->set('sleepCounter', 0);
+    clearBucketBlocks();
+}
+
+if ($aResult['flush']) {
+    $m->flush();
+}