X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e03ae6d7ebdf56d084b00091382f5bcf0cb7e486..b980f8e4e10f30b5202e5374f5488a429cadf2c7:/utils/blocks.php

diff --git a/utils/blocks.php b/utils/blocks.php
index 4d323115..bd5efd00 100755
--- a/utils/blocks.php
+++ b/utils/blocks.php
@@ -11,6 +11,7 @@
 		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);
 
@@ -23,18 +24,29 @@
 
 	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", "", "", "", "", "", "");
+		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 | %16s | %31s\n", $sKey, $aDetails['totalBlocks'], (int)$aDetails['currentBucketSize'], $aDetails['lastRequestBlocked']?'Y':'N', $aDetails['currentlyBlocked']?'Y':'N', date("r", $aDetails['lastBlockTimestamp']));
+			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['flush'])
+	{
+		$m->flush();
+	}