Merge pull request #46 from ppavlovic/master

ppavlovic · web-flow · commit 7e64574d7d8c · 2023-07-28T09:50:05.000+02:00
Fix FATAL error when setProfiler() was not called when initializing Tasker Runner
diff --git a/src/Tasker2/Runner.php b/src/Tasker2/Runner.php
@@ -107,6 +107,9 @@ public function clearProfilerData()
 
     public function registerProfilerTicker(\G4\Profiler\Ticker\TickerAbstract $profiler)
     {
+        if (!$this->profiler instanceof Profiler) {
+            return $this;
+        }
         $this->profiler->addProfiler($profiler);
         return $this;
     }
@@ -207,8 +210,10 @@ private function logTaskStart()
 
     private function logTaskExecution()
     {
-        if ($this->logger !== null) {
+        if ($this->profiler) {
             $this->taskerExecution->setProfiler($this->profiler);
+        }
+        if ($this->logger !== null) {
             $this->logger->log($this->taskerExecution);
         }
         if ($this->profiler) {

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,9 @@ public function clearProfilerData()`
`107`	`107`
`108`	`108`	`public function registerProfilerTicker(\G4\Profiler\Ticker\TickerAbstract $profiler)`
`109`	`109`	`{`
	`110`	`+ if (!$this->profiler instanceof Profiler) {`
	`111`	`+ return $this;`
	`112`	`+ }`
`110`	`113`	`$this->profiler->addProfiler($profiler);`
`111`	`114`	`return $this;`
`112`	`115`	`}`
`@@ -207,8 +210,10 @@ private function logTaskStart()`
`207`	`210`
`208`	`211`	`private function logTaskExecution()`
`209`	`212`	`{`
`210`		`- if ($this->logger !== null) {`
	`213`	`+ if ($this->profiler) {`
`211`	`214`	`$this->taskerExecution->setProfiler($this->profiler);`
	`215`	`+ }`
	`216`	`+ if ($this->logger !== null) {`
`212`	`217`	`$this->logger->log($this->taskerExecution);`
`213`	`218`	`}`
`214`	`219`	`if ($this->profiler) {`