Skip to content
Snippets Groups Projects
Commit 6025d2eb authored by Jakob Sack's avatar Jakob Sack
Browse files

Rename Backgroundjobs to BackgroundJob

parent 4f908600
No related branches found
No related tags found
No related merge requests found
......@@ -23,7 +23,7 @@
/**
* This class manages the regular tasks.
*/
class OC_Backgroundjobs_RegularTask{
class OC_BackgroundJob_RegularTask{
static private $registered = array();
/**
......@@ -32,7 +32,7 @@ class OC_Backgroundjobs_RegularTask{
* @param $method method name
* @return true
*/
static public function create( $klass, $method ){
static public function register( $klass, $method ){
// Create the data structure
self::$registered["$klass-$method"] = array( $klass, $method );
......
<?php
/**
* ownCloud - Background Job
*
......@@ -24,7 +23,7 @@
/**
* This class manages our scheduled tasks.
*/
class OC_Backgroundjobs_ScheduledTask{
class OC_BackgroundJob_ScheduledTask{
/**
* @brief Gets one scheduled task
* @param $id ID of the task
......
......@@ -25,7 +25,7 @@
*
* TODO: locking in doAllSteps
*/
class OC_Backgroundjobs_Worker{
class OC_BackgroundJob_Worker{
/**
* @brief executes all tasks
* @return boolean
......@@ -36,16 +36,16 @@ class OC_Backgroundjobs_Worker{
*/
public static function doAllSteps(){
// Do our regular work
$regular_tasks = OC_Backgroundjobs_RegularTask::all();
$regular_tasks = OC_BackgroundJob_RegularTask::all();
foreach( $regular_tasks as $key => $value ){
call_user_func( $value );
}
// Do our scheduled tasks
$scheduled_tasks = OC_Backgroundjobs_ScheduledTask::all();
$scheduled_tasks = OC_BackgroundJob_ScheduledTask::all();
foreach( $scheduled_tasks as $task ){
call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
OC_Backgroundjobs_ScheduledTask::delete( $task['id'] );
OC_BackgroundJob_ScheduledTask::delete( $task['id'] );
}
return true;
......@@ -67,7 +67,7 @@ class OC_Backgroundjobs_Worker{
$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
// What's the next step?
$regular_tasks = OC_Backgroundjobs_RegularTask::all();
$regular_tasks = OC_BackgroundJob_RegularTask::all();
ksort( $regular_tasks );
$done = false;
......@@ -87,12 +87,12 @@ class OC_Backgroundjobs_Worker{
}
}
else{
$tasks = OC_Backgroundjobs_ScheduledTask::all();
$tasks = OC_BackgroundJob_ScheduledTask::all();
if( length( $tasks )){
$task = $tasks[0];
// delete job before we execute it. This prevents endless loops
// of failing jobs.
OC_Backgroundjobs_ScheduledTask::delete($task['id']);
OC_BackgroundJob_ScheduledTask::delete($task['id']);
// execute job
call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment