Changeset 9893

Timestamp:

06/26/08 14:12:48 (2 months ago)

Author:

fabien

Message:

fixed locking issues with the clear-cache, log-rotate, enable, and disable tasks (closes #3827)

Files:

• branches/1.0/data/tasks/sfPakeMisc.php (modified) (4 diffs)
• branches/1.0/lib/log/sfLogManager.class.php (modified) (2 diffs)
• branches/1.0/lib/util/sfCore.class.php (modified) (1 diff)

branches/1.0/data/tasks/sfPakeMisc.php

@@ -200 +200 @@
-
-  // create a lock file
-
+
+
-
-  // change mode so the web user can remove it if we die
-name.'.lck', $sf_root_dir
+file, ''
-
-  // remove cache files
@@ -209 +210 @@
-
-  // release lock
-sf_root_dir.'/'.$lock_name.'.lck'
+lock_file
-}
-
@@ -296 +297 @@
-  $env = $args[1];
-
-clilo
+l
-  $locks = pakeFinder::type('file')->ignore_version_control()->prune('.svn')->discard('.svn')->maxdepth(0)->name($lockFile)->relative()->in('./');
-
@@ -322 +323 @@
-  $env = $args[1];
-
-clilo
+l
-
-  if (!file_exists(sfConfig::get('sf_root_dir').'/'.$lockFile))
-  {
-777
+
-
-    pake_echo_action('enable', "$app [$env] has been DISABLED");

branches/1.0/lib/log/sfLogManager.class.php

@@ -77 +77 @@
-    {
-      // create a lock file
-
-
+
+
+
-
-      // if log file exists rotate it
@@ -109 +110 @@
-        }
-      }
+
+      unlink($lockFile);
-    }
-  }

branches/1.0/lib/util/sfCore.class.php

@@ -95 +95 @@
-  static public function checkLock()
-  {
-
+
+
+
+
+
-    {
-      // application is not available