1 files changed, 10 insertions, 4 deletions
diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index eec8c968c..0042e92d2 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -149,14 +149,20 @@ function runIndexer(){
     }
 
     // try to aquire a lock
+    $run = 0;
     $lock = $conf['lockdir'].'/_indexer.lock';
     while(!@mkdir($lock,$conf['dmode'])){
         usleep(50);
-        if(time()-@filemtime($lock) > 60*5){
+        if(is_dir($lock) && time()-@filemtime($lock) > 60*5){
             // looks like a stale lock - remove it
-            @rmdir($lock);
-            print "runIndexer(): stale lock removed".NL;
-        }else{
+            if (!@rmdir($lock)) {
+                print "runIndexer(): removing the stale lock failed".NL;
+                return false;
+            } else {
+                print "runIndexer(): stale lock removed".NL;
+            }
+        }elseif($run++ == 1000){
+            // we waited 5 seconds for that lock
             print "runIndexer(): indexer locked".NL;
             return false;
         }