From f10ac4bc76a62d837102e701ac5e37e216933c2c Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben@sihnon.net>
Date: Sun, 25 Sep 2011 12:08:31 +0100
Subject: [PATCH] Update run-jobs to use standard init code, fix bug in
 previous commit

---
 webui/run-jobs.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/webui/run-jobs.php b/webui/run-jobs.php
index 3c48029..a801f0e 100644
--- a/webui/run-jobs.php
+++ b/webui/run-jobs.php
@@ -2,12 +2,10 @@
 
 define('HBC_File', 'run-jobs');
 
-require_once '/etc/ripping-cluster/config.php';
-require_once(SihnonFramework_Lib . 'SihnonFramework/Main.class.php');
+require_once '_inc.php';
+
 require_once 'Net/Gearman/Client.php';
 
-SihnonFramework_Main::registerAutoloadClasses('SihnonFramework', SihnonFramework_Lib,
-												'RippingCluster', RippingCluster_Lib);
 
 try {
     $main = RippingCluster_Main::instance();
@@ -23,7 +21,7 @@ try {
     foreach ($jobs as $job) {
         // Enqueue the job using gearman
         $args = $job->queue();
-        $task = new Net_Gearman_Task($args['method'], $args['rip_options']);
+        $task = new Net_Gearman_Task($args['method'], $args);
         $task->attachCallback('gearman_complete', Net_Gearman_Task::TASK_COMPLETE);
         $task->attachCallback('gearman_fail', Net_Gearman_Task::TASK_FAIL);
         $set->addTask($task);