Merge pull request #6 from romainneutron/race-conditions

Fix warnings and exceptions that could be thrown in some race conditions
flint · Sep 22, 2013 · ee649c7 · ee649c7
2 parents 123f9fa + e3661f1
commit ee649c7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/src/Lurker/Resource/DirectoryResource.php b/src/Lurker/Resource/DirectoryResource.php
@@ -12,6 +12,8 @@ class DirectoryResource extends BaseDirectoryResource implements ResourceInterfa
 
     public function exists()
     {
+        clearstatcache(true, $this->getResource());
+
         return is_dir($this);
     }
 
@@ -21,11 +23,12 @@ public function getModificationTime()
             return -1;
         }
 
-        $resource = $this->getResource();
-        clearstatcache(true, $resource);
-        $newestMTime = filemtime($resource);
+        clearstatcache(true, $this->getResource());
+        if (false === $mtime = @filemtime($this->getResource())) {
+            return -1;
+        }
 
-        return $newestMTime;
+        return $mtime;
     }
 
     public function isFresh($timestamp)
@@ -65,7 +68,12 @@ public function getFilteredResources()
             return array();
         }
 
-        $iterator = new \DirectoryIterator($this->getResource());
+        // race conditions
+        try {
+            $iterator = new \DirectoryIterator($this->getResource());
+        } catch (\UnexpectedValueException $e) {
+            return array();
+        }
 
         $resources = array();
         foreach ($iterator as $file) {

diff --git a/src/Lurker/Resource/FileResource.php b/src/Lurker/Resource/FileResource.php
@@ -15,11 +15,12 @@ public function getModificationTime()
             return -1;
         }
 
-        $resource = $this->getResource();
-
-        clearstatcache(true, $resource);
+        clearstatcache(true, $this->getResource());
+        if (false === $mtime = @filemtime($this->getResource())) {
+            return -1;
+        }
 
-        return filemtime($resource);
+        return $mtime;
     }
 
     public function getId()
@@ -38,7 +39,8 @@ public function isFresh($timestamp)
 
     public function exists()
     {
+        clearstatcache(true, $this->getResource());
+
         return is_file($this);
     }
-
 }