Changeset 9890

Timestamp:

06/26/08 13:35:01 (5 months ago)

Author:

fabien

Message:

fxed locking issues with the cache:clear, project:disable, project:enable, and log:rotate tasks (closes #3598)

Files:

• branches/1.1/lib/config/sfApplicationConfiguration.class.php (modified) (1 diff)
• branches/1.1/lib/task/cache/sfCacheClearTask.class.php (modified) (1 diff)
• branches/1.1/lib/task/log/sfLogRotateTask.class.php (modified) (2 diffs)
• branches/1.1/lib/task/project/sfProjectDisableTask.class.php (modified) (1 diff)
• branches/1.1/lib/task/project/sfProjectEnableTask.class.php (modified) (1 diff)

branches/1.1/lib/config/sfApplicationConfiguration.class.php

@@ -175 +175 @@
-  public function checkLock()
-  {
-
+
+
+
+
+
-    {
-      // application is not available - we'll find the most specific unavailable page...

branches/1.1/lib/task/cache/sfCacheClearTask.class.php

@@ -206 +206 @@
-  protected function getLockFile($app, $env)
-  {
-cache_dir').'/'.$app.'_'.$env.'
+data_dir').'/'.$app.'_'.$env.'-cli
-  }
-}

branches/1.1/lib/task/log/sfLogRotateTask.class.php

@@ -120 +120 @@
-    {
-      // create a lock file
-
+
+
+
+
+
-
-      // if log file exists rotate it
@@ -151 +155 @@
-        }
-      }
+
+      // release lock
+      $this->getFilesystem()->remove($lockFile);
-    }
-  }

branches/1.1/lib/task/project/sfProjectDisableTask.class.php

@@ -49 +49 @@
-    $env = $arguments['env'];
-
-cache
+data
-    if (file_exists($lockFile))
-    {
-      $this->logSection('enable', sprintf('%s [%s] is currently DISABLED', $app, $env));
-    }
+    else
+    {
+      $this->getFilesystem()->touch($lockFile);
-
-
-
-
+
+
-  }
-}

branches/1.1/lib/task/project/sfProjectEnableTask.class.php

@@ -49 +49 @@
-    $env = $arguments['env'];
-
-
-sfConfig::get('sf_cache_dir').'/'.
+sfConfig::get('sf_data_dir').'/'.
+
-    {
-      $this->logSection('enable', sprintf('%s [%s] is currently ENABLED', $app, $env));
-    }
+    else
+    {
+      $this->getFilesystem()->remove($lockFile);
-
-
+
+
+
-
-
-
-
-
-
+
+
-  }
-}