Changeset 7335
- Timestamp:
- 02/04/08 15:54:56 (10 months ago)
- Files:
-
- branches/1.1/lib/task/cache/sfCacheClearTask.class.php (modified) (2 diffs)
- branches/1.1/lib/task/log/sfLogRotateTask.class.php (modified) (1 diff)
- 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/util/sfCore.class.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.1/lib/task/cache/sfCacheClearTask.class.php
r6931 r7335 163 163 { 164 164 // create a lock file 165 $this->filesystem->touch(sfConfig::get('sf_ root_dir').'/'.$lockName.'.lck');165 $this->filesystem->touch(sfConfig::get('sf_cache_dir').'/'.$lockName.'.lck'); 166 166 167 167 // change mode so the web user can remove it if we die 168 $this->filesystem->chmod(sfConfig::get('sf_ root_dir').'/'.$lockName.'.lck', 0777);168 $this->filesystem->chmod(sfConfig::get('sf_cache_dir').'/'.$lockName.'.lck', 0777); 169 169 170 170 // remove cache files … … 172 172 173 173 // release lock 174 $this->filesystem->remove(sfConfig::get('sf_ root_dir').'/'.$lockName.'.lck');174 $this->filesystem->remove(sfConfig::get('sf_cache_dir').'/'.$lockName.'.lck'); 175 175 } 176 176 } branches/1.1/lib/task/log/sfLogRotateTask.class.php
r6931 r7335 120 120 { 121 121 // create a lock file 122 touch(sfConfig::get('sf_ root_dir').'/'.$app.'_'.$env.'.lck');122 touch(sfConfig::get('sf_cache_dir').'/'.$app.'_'.$env.'.lck'); 123 123 124 124 // if log file exists rotate it branches/1.1/lib/task/project/sfProjectDisableTask.class.php
r6931 r7335 50 50 51 51 $lockFile = $app.'_'.$env.'.lck'; 52 if (!file_exists(sfConfig::get('sf_ root_dir').'/'.$lockFile))52 if (!file_exists(sfConfig::get('sf_cache_dir').'/'.$lockFile)) 53 53 { 54 54 $this->filesystem->touch($lockFile); branches/1.1/lib/task/project/sfProjectEnableTask.class.php
r6931 r7335 50 50 51 51 $lockFile = $app.'_'.$env.'.lck'; 52 if (file_exists(sfConfig::get('sf_ root_dir').'/'.$lockFile))52 if (file_exists(sfConfig::get('sf_cache_dir').'/'.$lockFile)) 53 53 { 54 54 $this->filesystem->remove($lockFile); branches/1.1/lib/util/sfCore.class.php
r7322 r7335 163 163 static public function checkLock() 164 164 { 165 if (sfToolkit::hasLockFile( SF_ROOT_DIR.DIRECTORY_SEPARATOR.SF_APP.'_'.SF_ENVIRONMENT.'.lck', 5))165 if (sfToolkit::hasLockFile(sfConfig::get('sf_cache_dir').DIRECTORY_SEPARATOR.SF_APP.'_'.SF_ENVIRONMENT.'.lck', 5)) 166 166 { 167 167 // application is not available
