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

Removed OC_BackgroundJob - reduce class overhead 

* method code is now in the static public namespace (5 sloc)
This commit is contained in:
Morris Jobke 2015-04-18 23:37:32 +02:00
parent cdf82909b8
commit 60b8aa2a83
3 changed files with 7 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cron.php
View File

@ -64,7 +64,7 @@ try {
\OC::$server->getTempManager()->cleanOld();
// Exit if background jobs are disabled!
$appMode = OC_BackgroundJob::getExecutionType();
$appMode = \OCP\BackgroundJob::getExecutionType();
if ($appMode == 'none') {
if (OC::$CLI) {
echo 'Background Jobs are disabled!' . PHP_EOL;
@ -107,7 +107,7 @@ try {
// We call ownCloud from the CLI (aka cron)
if ($appMode != 'cron') {
OC_BackgroundJob::setExecutionType('cron');
\OCP\BackgroundJob::setExecutionType('cron');
}
// open the file and try to lock if. If it is not locked, the background

56
lib/private/backgroundjob.php
View File

@ -1,56 +0,0 @@
<?php
/**
* @author Bart Visscher <bartv@thisnet.nl>
* @author Felix Moeller <mail@felixmoeller.de>
* @author Jakob Sack <mail@jakobsack.de>
* @author Jörn Friedrich Dreyer <jfd@butonic.de>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
/**
* This class does the dirty work.
*/
class OC_BackgroundJob{
/**
* get the execution type of background jobs
* @return string
*
* This method returns the type how background jobs are executed. If the user
* did not select something, the type is ajax.
*/
public static function getExecutionType() {
return OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' );
}
/**
* sets the background jobs execution type
* @param string $type execution type
* @return false|null
*
* This method sets the execution type of the background jobs. Possible types
* are "none", "ajax", "webcron", "cron"
*/
public static function setExecutionType( $type ) {
if( !in_array( $type, array('none', 'ajax', 'webcron', 'cron'))) {
return false;
}
return OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', $type );
}
}

7
lib/public/backgroundjob.php
View File

@ -60,7 +60,7 @@ class BackgroundJob {
* @since 5.0.0
*/
public static function getExecutionType() {
return \OC_BackgroundJob::getExecutionType();
return \OC::$server->getConfig()->getAppValue('core', 'backgroundjobs_mode', 'ajax');
}
/**
@ -74,7 +74,10 @@ class BackgroundJob {
* @since 5.0.0
*/
public static function setExecutionType($type) {
return \OC_BackgroundJob::setExecutionType($type);
if( !in_array( $type, array('none', 'ajax', 'webcron', 'cron'))) {
return false;
}
\OC::$server->getConfig()->setAppValue('core', 'backgroundjobs_mode', $type);
}
/**