wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Error handling works better now

Browse source
This commit is contained in:
Jakob Sack 2012-08-09 23:49:20 +02:00
parent f46fdfd814
commit 7b3c35107d
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
cron.php
View file

@ -20,17 +20,19 @@
*
*/
function handleCliShutdown() {
$error = error_get_last();
if($error !== NULL){
echo 'Unexpected error!'.PHP_EOL;
}
// Unfortunately we need this class for shutdown function
class my_temporary_cron_class {
public static $sent = false;
}
function handleWebShutdown(){
$error = error_get_last();
if($error !== NULL){
OC_JSON::error( array( 'data' => array( 'message' => 'Unexpected error!')));
function handleUnexpectedShutdown() {
if( !my_temporary_cron_class::$sent ){
if( OC::$CLI ){
echo 'Unexpected error!'.PHP_EOL;
}
else{
OC_JSON::error( array( 'data' => array( 'message' => 'Unexpected error!')));
}
}
}
@ -59,9 +61,11 @@ else{
register_shutdown_function('handleWebShutdown');
if( $appmode == 'cron' ){
OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
exit();
}
OC_BackgroundJob_Worker::doNextStep();
OC_JSON::success();
else{
OC_BackgroundJob_Worker::doNextStep();
OC_JSON::success();
}
}
my_temporary_cron_class::$sent = true;
exit();