Expose auto load path configuration for child execured process.

stevenchiu7311 · Jun 5, 2019 · 63f6d73 · 63f6d73
1 parent e4c9990
commit 63f6d73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/JobScheduler.php b/src/JobScheduler.php
@@ -2,9 +2,6 @@
 
 namespace TimeWorker;
 
-include_once __DIR__.'/../vendor/autoload.php';
-include_once __DIR__ . '/RedisFactory.php';
-
 use React\EventLoop\Factory;
 
 class JobScheduler
@@ -38,7 +35,8 @@ public function __construct(
         $port = 6379,
         $db = 0,
         $executableTime = self::EXECUTABLE_TIME,
-        $pollingInterval = self::POLLING_INTERVAL
+        $pollingInterval = self::POLLING_INTERVAL,
+        $autoloadPath = __DIR__."/../../../../vendor/autoload.php"
     ) {
         $this->redisConf['host'] = $host;
         $this->redisConf['port'] = $port;
@@ -48,7 +46,7 @@ public function __construct(
         $this->subPattern = '__keyspace@' . $db . '__:';
         $this->executableTime = $executableTime;
         $this->pollingInterval = $pollingInterval;
-        $this->forkChildCmd = "php -r \"include '" . __FILE__ . "'; TimeWorker\JobScheduler::fork(1, '$host', $port, $db);\"";
+        $this->forkChildCmd = "php -r \"include_once '$autoloadPath'; include '".__DIR__."/RedisFactory.php'; use TimeWorker\JobScheduler; TimeWorker\JobScheduler::fork(1, '$host', $port, $db);\"";
 
         $looper = Factory::create();
         $this->looper = $looper;

diff --git a/test/job_test.php b/test/job_test.php
@@ -18,7 +18,7 @@ function init($redisConf, $isJobSubmitter = false)
 {
     global $db;
     try {
-        $scheduler = new JobScheduler(0, $redisConf['host'], $redisConf['port'], $db, 180, 30);
+        $scheduler = new JobScheduler(0, $redisConf['host'], $redisConf['port'], $db, 180, 30, __DIR__."/../vendor/autoload.php");
         testAddJob($redisConf);
         $scheduler->getLooper()->addPeriodicTimer(20, function () use ($redisConf) {
             testAddJob($redisConf);