Optimization when creating dirs.

ivopetkov · Sep 3, 2017 · 68df1a5 · 68df1a5
1 parent 8a205ea
commit 68df1a5
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/ObjectStorage.php b/src/ObjectStorage.php
@@ -833,7 +833,7 @@ private function createFileDirIfNotExists($filename)
             } elseif (is_file($pathinfo['dirname'])) {
                 return false;
             } else {
-                return mkdir($pathinfo['dirname'], 0777, true);
+                return $this->createDirIfNotExists($pathinfo['dirname']);
             }
         }
         return false;
@@ -847,8 +847,21 @@ private function createFileDirIfNotExists($filename)
     private function createDirIfNotExists($dir)
     {
         if (!is_dir($dir)) {
-            mkdir($dir, 0777, true);
+            try {
+                set_error_handler(function($errno, $errstr, $errfile, $errline) {
+                    restore_error_handler();
+                    throw new \IvoPetkov\ObjectStorage\ErrorException($errstr, 0, $errno, $errfile, $errline);
+                });
+                $result = mkdir($dir, 0777, true);
+                restore_error_handler();
+                return $result;
+            } catch (\IvoPetkov\ObjectStorage\ErrorException $e) {
+                if ($e->getMessage() !== 'mkdir(): File exists') { // The directory may be just created in other process.
+                    throw $e;
+                }
+            }
         }
+        return true;
     }
 
     /**