mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2951 from owncloud/no_personal_variables 

No personal prefixes for variables.
This commit is contained in:
icewind1991 2013-04-16 15:43:20 -07:00
parent 7049436058 6ee2b4c740
commit c50dfd7251
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cron.php
View File

@ -21,7 +21,7 @@
*/ */
// Unfortunately we need this class for shutdown function // Unfortunately we need this class for shutdown function
class my_temporary_cron_class { class TemporaryCronClass {
public static $sent = false; public static $sent = false;
public static $lockfile = ""; public static $lockfile = "";
public static $keeplock = false; public static $keeplock = false;
@ -30,12 +30,12 @@ class my_temporary_cron_class {
// We use this function to handle (unexpected) shutdowns // We use this function to handle (unexpected) shutdowns
function handleUnexpectedShutdown() { function handleUnexpectedShutdown() {
// Delete lockfile // Delete lockfile
if( !my_temporary_cron_class::$keeplock && file_exists( my_temporary_cron_class::$lockfile )) { if( !TemporaryCronClass::$keeplock && file_exists( TemporaryCronClass::$lockfile )) {
unlink( my_temporary_cron_class::$lockfile ); unlink( TemporaryCronClass::$lockfile );
} }
// Say goodbye if the app did not shutdown properly // Say goodbye if the app did not shutdown properly
if( !my_temporary_cron_class::$sent ) { if( !TemporaryCronClass::$sent ) {
if( OC::$CLI ) { if( OC::$CLI ) {
echo 'Unexpected error!'.PHP_EOL; echo 'Unexpected error!'.PHP_EOL;
} }
@ -64,7 +64,7 @@ OC_Helper::cleanTmpNoClean();
// Exit if background jobs are disabled! // Exit if background jobs are disabled!
$appmode = OC_BackgroundJob::getExecutionType(); $appmode = OC_BackgroundJob::getExecutionType();
if( $appmode == 'none' ) { if( $appmode == 'none' ) {
my_temporary_cron_class::$sent = true; TemporaryCronClass::$sent = true;
if( OC::$CLI ) { if( OC::$CLI ) {
echo 'Background Jobs are disabled!'.PHP_EOL; echo 'Background Jobs are disabled!'.PHP_EOL;
} }
@ -76,7 +76,7 @@ if( $appmode == 'none' ) {
if( OC::$CLI ) { if( OC::$CLI ) {
// Create lock file first // Create lock file first
my_temporary_cron_class::$lockfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' ).'/cron.lock'; TemporaryCronClass::$lockfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' ).'/cron.lock';
// We call ownCloud from the CLI (aka cron) // We call ownCloud from the CLI (aka cron)
if( $appmode != 'cron' ) { if( $appmode != 'cron' ) {
@ -85,15 +85,15 @@ if( OC::$CLI ) {
} }
// check if backgroundjobs is still running // check if backgroundjobs is still running
if( file_exists( my_temporary_cron_class::$lockfile )) { if( file_exists( TemporaryCronClass::$lockfile )) {
my_temporary_cron_class::$keeplock = true; TemporaryCronClass::$keeplock = true;
my_temporary_cron_class::$sent = true; TemporaryCronClass::$sent = true;
echo "Another instance of cron.php is still running!"; echo "Another instance of cron.php is still running!";
exit( 1 ); exit( 1 );
} }
// Create a lock file // Create a lock file
touch( my_temporary_cron_class::$lockfile ); touch( TemporaryCronClass::$lockfile );
// Work // Work
OC_BackgroundJob_Worker::doAllSteps(); OC_BackgroundJob_Worker::doAllSteps();
@ -112,5 +112,5 @@ else{
} }
// done! // done!
my_temporary_cron_class::$sent = true; TemporaryCronClass::$sent = true;
exit(); exit();