From 21bd423f02c2b472e768f943db4c9d455412a564 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sat, 18 Jun 2011 17:45:20 +0100 Subject: [PATCH 01/12] Rename worker file --- .../{handbrake-cluster-worker.php => ripping-cluster-worker.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename worker/{handbrake-cluster-worker.php => ripping-cluster-worker.php} (100%) diff --git a/worker/handbrake-cluster-worker.php b/worker/ripping-cluster-worker.php similarity index 100% rename from worker/handbrake-cluster-worker.php rename to worker/ripping-cluster-worker.php From cd93f13f41851a030a934d3a49d8c6d1ebc24bb1 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sat, 18 Jun 2011 18:30:03 +0100 Subject: [PATCH 02/12] Add gentoo init script --- build/ripping-cluster-worker.init-gentoo | 29 ++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 build/ripping-cluster-worker.init-gentoo diff --git a/build/ripping-cluster-worker.init-gentoo b/build/ripping-cluster-worker.init-gentoo new file mode 100644 index 0000000..27f5d00 --- /dev/null +++ b/build/ripping-cluster-worker.init-gentoo @@ -0,0 +1,29 @@ +#!/sbin/runscript +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +PID_FILE="/var/run/ripping-cluster-worker.pid" + +depend() { + need localmount net + use dns logger puppetmaster netmount nfsmount +} + +start() { + ebegin "Starting ripping-cluster-worker" + start-stop-daemon --start --quiet \ + --pidfile ${PID_FILE} \ + --exec /usr/bin/php /usr/lib/ripping-cluster/worker/ripping-cluster-worker.php + eend $? "Failed to start ripping-cluster-worker" +} + +stop() { + ebegin "Stopping ripping-cluster-worker" + start-stop-daemon --stop --quiet \ + --pidfile ${PID_FILE} + local ret=$? + eend ${ret} "Failed to stop puppet" + rm -f ${PID_FILE} + return ${ret} +} + From bd74b0f54e8142f5761b6e255002416772ea1b46 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sat, 18 Jun 2011 18:35:40 +0100 Subject: [PATCH 03/12] Update default config files --- private/config.php.dist | 79 +++++++++++++++++++++++++++++++++++--- private/dbconfig.conf.dist | 6 +-- 2 files changed, 77 insertions(+), 8 deletions(-) diff --git a/private/config.php.dist b/private/config.php.dist index f174732..0842246 100644 --- a/private/config.php.dist +++ b/private/config.php.dist @@ -1,5 +1,25 @@ \ No newline at end of file +/** + * Sihnon Config Plugin + * + * Specifies the plugin to use for configuration value storage. + * Options include: + * - Database (Requires Database Support to be enabled, and the Sihnon_ConfigTable option set) + * - FlatFile (Requires the Sihnon_ConfigFile option set) + * + * @var string + */ +define('Sihnon_ConfigPlugin', 'Database'); + +/** + * Sihnon Config Table + * + * Specifies the name of the database table thats used for storing configuration values + * when the Database Config Plugin is used. + * + * @var string + */ +define('Sihnon_ConfigTable', 'settings'); + +/** + * Sihnon Config File + * + * Specifies the name of the file used to store configuration values when the FlatFile Config Plugin is used + * + * @var string + */ +define('Sihnon_ConfigFile', '/etc/ripping-cluster/settings.txt'); + +/** + * Sihnon Development Mode + * + * Specifies whether or not the Framework should operate in debug mode + * + * @var bool + */ +define('Sihnon_Dev', false); + +?> diff --git a/private/dbconfig.conf.dist b/private/dbconfig.conf.dist index 5bc9cce..2c5a74c 100644 --- a/private/dbconfig.conf.dist +++ b/private/dbconfig.conf.dist @@ -1,5 +1,5 @@ hostname = localhost -username = handbrake -password = handbrake -dbname = handbrake_cluster +username = ripping +password = ripping +dbname = ripping_cluster From edc243923259758808934ebbd30ca037e5f0fd95 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sat, 18 Jun 2011 18:36:33 +0100 Subject: [PATCH 04/12] Make worker read configuration from /etc/ripping-cluster --- worker/ripping-cluster-worker.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/ripping-cluster-worker.php b/worker/ripping-cluster-worker.php index 79fabe9..125bebe 100644 --- a/worker/ripping-cluster-worker.php +++ b/worker/ripping-cluster-worker.php @@ -2,7 +2,7 @@ define('HBC_File', 'worker'); -require_once '../private/config.php'; +require_once '/etc/ripping-cluster/config.php'; require_once(SihnonFramework_Lib . 'SihnonFramework/Main.class.php'); require_once 'Net/Gearman/Worker.php'; From 274bc8f3c9dd75784a3cc3119b2cedd91ddba780 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sat, 18 Jun 2011 22:15:36 +0100 Subject: [PATCH 05/12] Use defines for library paths --- worker/ripping-cluster-worker.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worker/ripping-cluster-worker.php b/worker/ripping-cluster-worker.php index 125bebe..3e9b746 100644 --- a/worker/ripping-cluster-worker.php +++ b/worker/ripping-cluster-worker.php @@ -7,8 +7,8 @@ require_once(SihnonFramework_Lib . 'SihnonFramework/Main.class.php'); require_once 'Net/Gearman/Worker.php'; SihnonFramework_Main::registerAutoloadClasses('SihnonFramework', SihnonFramework_Lib, - 'RippingCluster', SihnonFramework_Main::makeAbsolutePath('../source/lib/')); -SihnonFramework_Main::registerAutoloadClasses('Net', SihnonFramework_Main::makeAbsolutePath('../source/lib/')); + 'RippingCluster', SihnonFramework_Main::makeAbsolutePath(RippingCluster_Lib)); +SihnonFramework_Main::registerAutoloadClasses('Net', SihnonFramework_Main::makeAbsolutePath(RippingCluster_Lib)); try { From 8fe8f8ba08920b977a29dd98f1d5216e8037fdb1 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sat, 18 Jun 2011 23:53:25 +0100 Subject: [PATCH 06/12] Use defines for library paths --- webui/run-jobs.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webui/run-jobs.php b/webui/run-jobs.php index 047e2c8..93a4a97 100644 --- a/webui/run-jobs.php +++ b/webui/run-jobs.php @@ -2,12 +2,12 @@ define('HBC_File', 'run-jobs'); -require_once '../private/config.php'; +require_once '/etc/ripping-cluster/config.php'; require_once(SihnonFramework_Lib . 'SihnonFramework/Main.class.php'); require_once 'Net/Gearman/Client.php'; SihnonFramework_Main::registerAutoloadClasses('SihnonFramework', SihnonFramework_Lib, - 'RippingCluster', SihnonFramework_Main::makeAbsolutePath('../source/lib/')); + 'RippingCluster', RippingCluster_Lib); try { $main = RippingCluster_Main::instance(); From e1bd324e847d3cf7b151466aa0133bb72582bc59 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sun, 19 Jun 2011 00:13:39 +0100 Subject: [PATCH 07/12] Bugfix: error in client log call --- webui/run-jobs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webui/run-jobs.php b/webui/run-jobs.php index 93a4a97..6df9f41 100644 --- a/webui/run-jobs.php +++ b/webui/run-jobs.php @@ -34,7 +34,7 @@ try { // Start the job queue $result = $client->runSet($set); - RippingCluster_LogEntry::info($log, 'Job queue completed', 'batch'); + RippingCluster_ClientLogEntry::info($log, null, 'Job queue completed', 'batch'); } catch (RippingCluster_Exception $e) { die("Uncaught Exception (" . get_class($e) . "): " . $e->getMessage() . "\n"); From c0d8747b21880270c847554b3b5182d2374bfd35 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sun, 19 Jun 2011 22:48:45 +0100 Subject: [PATCH 08/12] Update init script to background the worker process --- build/ripping-cluster-worker.init-gentoo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ripping-cluster-worker.init-gentoo b/build/ripping-cluster-worker.init-gentoo index 27f5d00..0abdb95 100644 --- a/build/ripping-cluster-worker.init-gentoo +++ b/build/ripping-cluster-worker.init-gentoo @@ -12,7 +12,7 @@ depend() { start() { ebegin "Starting ripping-cluster-worker" start-stop-daemon --start --quiet \ - --pidfile ${PID_FILE} \ + --background --make-pidfile --pidfile ${PID_FILE} \ --exec /usr/bin/php /usr/lib/ripping-cluster/worker/ripping-cluster-worker.php eend $? "Failed to start ripping-cluster-worker" } From 3da59727dee0c66eee1db04b62baf5314c788e03 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Mon, 20 Jun 2011 19:29:11 +0100 Subject: [PATCH 09/12] Bug fix: typo in variable name --- webui/run-jobs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webui/run-jobs.php b/webui/run-jobs.php index 6df9f41..7fdb68a 100644 --- a/webui/run-jobs.php +++ b/webui/run-jobs.php @@ -55,7 +55,7 @@ function gearman_fail($task) { $main = RippingCluster_Main::instance(); $log = $main->log(); - $job = RippingCluster_Job::fromId($task->args['rip_options']['id']); + $job = RippingCluster_Job::fromId($task->arg['rip_options']['id']); $job->updateStatus(RippingCluster_JobStatus::FAILED); RippingCluster_ClientLogEntry::info($log, $job->id(), 'Job failed'); From 506a6e189cc217e8dd3c3862ae5f08984758c031 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Mon, 20 Jun 2011 19:34:27 +0100 Subject: [PATCH 10/12] Update paths for packaging --- webui/_inc.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/webui/_inc.php b/webui/_inc.php index 09521ce..fc2278b 100644 --- a/webui/_inc.php +++ b/webui/_inc.php @@ -1,10 +1,9 @@ From 841a5b9f924abe769f9531ad6bef07980eabe923 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Mon, 20 Jun 2011 22:04:44 +0100 Subject: [PATCH 11/12] Revert previous untested change in include statements --- webui/_inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webui/_inc.php b/webui/_inc.php index fc2278b..c65988b 100644 --- a/webui/_inc.php +++ b/webui/_inc.php @@ -1,9 +1,9 @@ From efb7db35d8f0f29fc0f15bee95544dd487d410f9 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Mon, 20 Jun 2011 22:33:18 +0100 Subject: [PATCH 12/12] Fixed typo in _inc.php --- webui/_inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webui/_inc.php b/webui/_inc.php index c65988b..d80eca9 100644 --- a/webui/_inc.php +++ b/webui/_inc.php @@ -3,7 +3,7 @@ require_once '/etc/ripping-cluster/config.php'; require_once SihnonFramework_Lib . 'SihnonFramework/Main.class.php'; -SihnonFramework::registerAutoloadClasses('SihnonFramework', SihnonFramework_Lib, +SihnonFramework_Main::registerAutoloadClasses('SihnonFramework', SihnonFramework_Lib, 'RippingCluster', RippingCluster_Lib); ?>