improve cron.php, add locking for cli cron.php
This commit is contained in:
parent
9cf9d41e51
commit
f5f204de56
36
cron.php
36
cron.php
|
@ -23,9 +23,18 @@
|
||||||
// Unfortunately we need this class for shutdown function
|
// Unfortunately we need this class for shutdown function
|
||||||
class my_temporary_cron_class {
|
class my_temporary_cron_class {
|
||||||
public static $sent = false;
|
public static $sent = false;
|
||||||
|
public static $lockfile = "";
|
||||||
|
public static $keeplock = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// We use this function to handle (unexpected) shutdowns
|
||||||
function handleUnexpectedShutdown() {
|
function handleUnexpectedShutdown() {
|
||||||
|
// Delete lockfile
|
||||||
|
if( !my_temporary_cron_class::$keeplock && file_exists( my_temporary_cron_class::$lockfile )){
|
||||||
|
unlink( my_temporary_cron_class::$lockfile );
|
||||||
|
}
|
||||||
|
|
||||||
|
// Say goodbye if the app did not shutdown properly
|
||||||
if( !my_temporary_cron_class::$sent ) {
|
if( !my_temporary_cron_class::$sent ) {
|
||||||
if( OC::$CLI ) {
|
if( OC::$CLI ) {
|
||||||
echo 'Unexpected error!'.PHP_EOL;
|
echo 'Unexpected error!'.PHP_EOL;
|
||||||
|
@ -48,7 +57,7 @@ if( !OC_Config::getValue( 'installed', false )) {
|
||||||
register_shutdown_function('handleUnexpectedShutdown');
|
register_shutdown_function('handleUnexpectedShutdown');
|
||||||
|
|
||||||
// Exit if background jobs are disabled!
|
// Exit if background jobs are disabled!
|
||||||
$appmode = OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' );
|
$appmode = OC_BackgroundJob::getType();
|
||||||
if( $appmode == 'none' ) {
|
if( $appmode == 'none' ) {
|
||||||
my_temporary_cron_class::$sent = true;
|
my_temporary_cron_class::$sent = true;
|
||||||
if( OC::$CLI ) {
|
if( OC::$CLI ) {
|
||||||
|
@ -61,29 +70,42 @@ if( $appmode == 'none' ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if( OC::$CLI ) {
|
if( OC::$CLI ) {
|
||||||
|
// Create lock file first
|
||||||
|
my_temporary_cron_class::$lockfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' ).'/cron.lock';
|
||||||
|
|
||||||
|
// We call ownCloud from the CLI (aka cron)
|
||||||
if( $appmode != 'cron' ) {
|
if( $appmode != 'cron' ) {
|
||||||
OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', 'cron' );
|
// Use cron in feature!
|
||||||
|
OC_BackgroundJob::setType('cron' );
|
||||||
}
|
}
|
||||||
|
|
||||||
// check if backgroundjobs is still running
|
// check if backgroundjobs is still running
|
||||||
$pid = OC_Appconfig::getValue( 'core', 'backgroundjobs_pid', false );
|
if( file_exists( my_temporary_cron_class::$lockfile )){
|
||||||
if( $pid !== false ) {
|
my_temporary_cron_class::$keeplock = true;
|
||||||
// FIXME: check if $pid is still alive (*nix/mswin). if so then exit
|
my_temporary_cron_class::$sent = true;
|
||||||
|
echo "Another instance of cron.php is still running!";
|
||||||
|
exit( 1 );
|
||||||
}
|
}
|
||||||
// save pid
|
|
||||||
OC_Appconfig::setValue( 'core', 'backgroundjobs_pid', getmypid());
|
// Create a lock file
|
||||||
|
touch( my_temporary_cron_class::$lockfile );
|
||||||
|
|
||||||
// Work
|
// Work
|
||||||
OC_BackgroundJob_Worker::doAllSteps();
|
OC_BackgroundJob_Worker::doAllSteps();
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
|
// We call cron.php from some website
|
||||||
if( $appmode == 'cron' ) {
|
if( $appmode == 'cron' ) {
|
||||||
|
// Cron is cron :-P
|
||||||
OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
|
OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
|
// Work and success :-)
|
||||||
OC_BackgroundJob_Worker::doNextStep();
|
OC_BackgroundJob_Worker::doNextStep();
|
||||||
OC_JSON::success();
|
OC_JSON::success();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// done!
|
||||||
my_temporary_cron_class::$sent = true;
|
my_temporary_cron_class::$sent = true;
|
||||||
exit();
|
exit();
|
||||||
|
|
Loading…
Reference in New Issue