restrict to one sleep per bucket. A second sleep while already sleeping results...

[nominatim.git] / lib / init-website.php

diff --git a/lib/init-website.php b/lib/init-website.php
index 445bbc7ced2e5048f31766c78f6d0b40225c478f..8603e309f426f888bb8bd1834ee8a6b86be75736 100644 (file)
--- a/lib/init-website.php
+++ b/lib/init-website.php
@@ -26,15 +26,17 @@
                        $m->add('sleepCounter', 0);
                        $iCurrentSleeping = $m->increment('sleepCounter');
                }
-               if ($iCurrentSleeping >= CONST_ConnectionBucket_MaxSleeping)
+               if ($iCurrentSleeping >= CONST_ConnectionBucket_MaxSleeping || isBucketSleeping($aBucketKeys))
                {
                        // Too many threads sleeping already.  This becomes a hard block.
                        $fBucketVal = doBucket($aBucketKeys, CONST_ConnectionBucket_BlockLimit, CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_BlockLimit);
                }
                else
                {
+                       setBucketSleeping($aBucketKeys, true);
                        sleep(($fBucketVal - CONST_ConnectionBucket_WaitLimit)/CONST_ConnectionBucket_LeakRate);
                        $fBucketVal = doBucket($aBucketKeys, CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_BlockLimit);
+                       setBucketSleeping($aBucketKeys, false);
                }
                $m->decrement('sleepCounter');
        }
@@ -48,3 +50,4 @@
        }
 
        header('Content-type: text/html; charset=utf-8');
+