Merge pull request jobbyphp#62 from garethellis36/check-if-job-should-run-in-main-process

Check if job is due to run in main process

Author: hellogerard

src/BackgroundJob.php

@@ -198,13 +198,8 @@ protected function shouldRun()
             }
         }
 
-        $schedule = \DateTime::createFromFormat('Y-m-d H:i:s', $this->config['schedule']);
-        if ($schedule !== false) {
-            return $schedule->format('Y-m-d H:i') == (date('Y-m-d H:i'));
-        }
-
-        $cron = CronExpression::factory($this->config['schedule']);
-        if (!$cron->isDue()) {
+        $scheduleChecker = new ScheduleChecker();
+        if (!$scheduleChecker->isDue($this->config['schedule'])) {
             return false;
         }
 

src/Jobby.php

@@ -144,7 +144,11 @@ public function run()
             throw new Exception('posix extension is required');
         }
 
+        $scheduleChecker = new ScheduleChecker();
         foreach ($this->jobs as $job => $config) {
+            if (!$scheduleChecker->isDue($config['schedule'])) {
+                continue;
+            }
             if ($isUnix) {
                 $this->runUnix($job, $config);
             } else {

src/ScheduleChecker.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Jobby;
+
+use Cron\CronExpression;
+
+class ScheduleChecker
+{
+    /**
+     * @param string $schedule
+     * @return bool
+     */
+    public function isDue($schedule)
+    {
+        $dateTime = \DateTime::createFromFormat('Y-m-d H:i:s', $schedule);
+        if ($dateTime !== false) {
+            return $dateTime->format('Y-m-d H:i') == (date('Y-m-d H:i'));
+        }
+
+        return CronExpression::factory($schedule)->isDue();
+    }
+}

tests/JobbyTest.php

@@ -67,6 +67,32 @@ public function testShell()
         $this->assertEquals('Hello World!', $this->getLogContent());
     }
 
+    /**
+     * @return void
+     */
+    public function testBackgroundProcessIsNotSpawnedIfJobIsNotDueToBeRun()
+    {
+        $hour = date("H", strtotime("+1 hour"));
+        $jobby = new Jobby();
+        $jobby->add(
+            'HelloWorldShell',
+            [
+                'command'  => 'php ' . __DIR__ . '/_files/helloworld.php',
+                'schedule' => "* {$hour} * * *",
+                'output'   => $this->logFile,
+            ]
+        );
+        $jobby->run();
+
+        // Job runs asynchronously, so wait a bit
+        sleep($this->getSleepTime());
+
+        $this->assertFalse(
+            file_exists($this->logFile),
+            "Failed to assert that log file doesn't exist and that background process did not spawn"
+        );
+    }
+
     /**
      * @covers ::add
      * @covers ::run

tests/ScheduleCheckerTest.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Jobby\Tests;
+
+use Jobby\ScheduleChecker;
+use PHPUnit_Framework_TestCase;
+
+class ScheduleCheckerTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ScheduleChecker
+     */
+    private $scheduleChecker;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->scheduleChecker = new ScheduleChecker();
+    }
+
+    /**
+     * @return void
+     */
+    public function test_it_can_detect_a_due_job_from_a_datetime_string()
+    {
+        $this->assertTrue($this->scheduleChecker->isDue(date('Y-m-d H:i:s')));
+    }
+
+    /**
+     * @return void
+     */
+    public function test_it_can_detect_a_non_due_job_from_a_datetime_string()
+    {
+        $this->assertFalse($this->scheduleChecker->isDue(date('Y-m-d H:i:s', strtotime('tomorrow'))));
+    }
+
+    /**
+     * @return void
+     */
+    public function test_it_can_detect_a_due_job_from_a_cron_expression()
+    {
+        $this->assertTrue($this->scheduleChecker->isDue("* * * * *"));
+    }
+
+    /**
+     * @return void
+     */
+    public function test_it_can_detect_a_non_due_job_from_a_cron_expression()
+    {
+        $hour = date("H", strtotime('+1 hour'));
+        $this->assertFalse($this->scheduleChecker->isDue("* {$hour} * * *"));
+    }
+}