Merge pull request jobbyphp#44 from CarsonF/feature/extendable-background-job

Configurable background job

Author: hellogerard

bin/run-job

@@ -0,0 +1,20 @@
+#!/usr/bin/env php
+<?php
+
+if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
+    require_once __DIR__ . '/../vendor/autoload.php';
+} else {
+    require_once __DIR__ . '/../../../autoload.php';
+}
+
+parse_str($argv[2], $config);
+
+$cls = $config['jobClass'];
+
+if (!is_a($cls, 'Jobby\BackgroundJob', true)) {
+    throw new Jobby\Exception('"jobClass" needs to be an instanceof Jobby\BackgroundJob');
+}
+
+/** @var \Jobby\BackgroundJob $job */
+$job = new $cls($argv[1], $config);
+$job->run();

src/BackgroundJob.php

@@ -284,23 +284,3 @@ protected function runFile()
         }
     }
 }
-
-// run this file, if executed directly
-// @see: http://stackoverflow.com/questions/2413991/php-equivalent-of-pythons-name-main
-// @codeCoverageIgnoreStart
-$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-if (!empty($trace)) {
-    return;
-}
-
-if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
-    require_once __DIR__ . '/../vendor/autoload.php';
-} else {
-    require_once __DIR__ . '/../../../autoload.php';
-}
-
-global $argv;
-parse_str($argv[2], $config);
-$job = new BackgroundJob($argv[1], $config);
-$job->run();
-// @codeCoverageIgnoreEnd

src/Jobby.php

@@ -35,7 +35,7 @@ public function __construct(array $config = [])
         $this->setConfig($this->getDefaultConfig());
         $this->setConfig($config);
 
-        $this->script = __DIR__ . DIRECTORY_SEPARATOR . 'BackgroundJob.php';
+        $this->script = realpath(__DIR__ . '/../bin/run-job');
     }
 
     /**
@@ -56,6 +56,7 @@ protected function getHelper()
     public function getDefaultConfig()
     {
         return [
+            'jobClass'       => 'Jobby\BackgroundJob',
             'recipients'     => null,
             'mailer'         => 'sendmail',
             'maxRuntime'     => null,

tests/JobbyTest.php

@@ -286,7 +286,7 @@ public function testShouldFailIfMaxRuntimeExceeded()
         $jobby->run();
         sleep(2);
         $jobby->run();
-        sleep(1);
+        sleep(2);
 
         $this->assertContains('ERROR: MaxRuntime of 1 secs exceeded!', $this->getLogContent());
     }