Changeset 20334 for events/phpframework/sabel/trunk/lib/UserCache.php

Timestamp:

10/01/08 04:26:27 (3 months ago)

Author:

sabel

Message:

clean-up

Files:

• events/phpframework/sabel/trunk/lib/UserCache.php (modified) (1 diff)

events/phpframework/sabel/trunk/lib/UserCache.php

@@ -29 +29 @@
   {
     $path = $this->getPath($userId);
-    if (is_file($path)) {
-      include ($path);
-      if ($this->check($data)) {
-        return $data;
-      } else {
-        unlink($path);
-        return false;
-      }
-    } else {
-      return false;
-    }
+    return (is_file($path)) ? $this->_read($path) : false;
   }
   
   public function lock($userId, $mode = "ab+")
   {
-    $i = 0;
     $path = $this->getPath($userId);
+    $fp   = fopen($path, $mode);
+    $data = $this->_read($path);
     
-    while (++$i < 5) {
-      $fp = fopen($path, $mode);
-      if (flock($fp, LOCK_EX)) {
-        ftruncate($fp, 0);
-        return $fp;
-      } else {
-        usleep(mt_rand(50000, 500000));
-      }
+    flock($fp, LOCK_EX);
+    ftruncate($fp, 0);
+    
+    return array($fp, $data);
+  }
+  
+  protected function _read($path)
+  {
+    include ($path);
+    if (isset($data) && $this->check($data)) {
+      return $data;
+    } else {
+      return false;
     }
-    
-    return false;
   }