upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Backgroundjobs: Improve error handling in cron.php

Browse source
This commit is contained in:
Jakob Sack 2012-08-09 22:22:43 +02:00
parent a6a1f892f0
commit 66511469e0
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cron.php
View file

@ -20,11 +20,26 @@
*
*/
function handleCliShutdown() {
$error = error_get_last();
if($error !== NULL){
echo 'Unexpected error!'.PHP_EOL;
}
}
function handleWebShutdown(){
$error = error_get_last();
if($error !== NULL){
OC_JSON::error( array( 'data' => array( 'message' => 'Unexpected error!')));
}
}
$RUNTIME_NOSETUPFS = true;
require_once('lib/base.php');
$appmode = OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' );
if( OC::$CLI ){
register_shutdown_function('handleCliShutdown');
if( $appmode != 'cron' ){
OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', 'cron' );
}
@ -41,6 +56,7 @@ if( OC::$CLI ){
OC_BackgroundJob_Worker::doAllSteps();
}
else{
register_shutdown_function('handleWebShutdown');
if( $appmode == 'cron' ){
OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
exit();