Merge pull request #55 from ppavlovic/master

Added ts_finished when task finished executing
clearProfilers when execution finishes
ts_started now in microseconds
php7.3 as minimum requirements

Author: ppavlovic

composer.json

@@ -28,9 +28,9 @@
     "require": {
         "ext-json"       : "*",
         "ext-pdo"        : "*",
-        "php"            : ">=5.6",
+        "php"            : ">=7.3",
         "g4/cron"        : "*",
-        "g4/log"         : ">=1.23.0",
+        "g4/log"         : ">=1.48.0",
         "g4/mcache"      : "^1.4 || ^2.0"
     },
     "require-dev": {

src/Model/Domain/Task.php

@@ -56,6 +56,11 @@ class Task
      */
     private $tsStarted;
 
+    /**
+     * @var int
+     */
+    private $tsFinished;
+
     /**
      * @var float
      */
@@ -204,6 +209,14 @@ public function getTsStarted()
         return $this->tsStarted;
     }
 
+    /**
+     * @return int
+     */
+    public function getTsFinished()
+    {
+        return $this->tsFinished;
+    }
+
     /**
      * @return int
      */
@@ -301,6 +314,15 @@ public function setTsStarted($value)
         return $this;
     }
 
+    /**
+     * @return \G4\Tasker\Model\Domain\Task
+     */
+    public function setTsFinished($value)
+    {
+        $this->tsFinished = $value;
+        return $this;
+    }
+
     /**
      * @return \G4\Tasker\Model\Domain\Task
      */
@@ -340,6 +362,7 @@ public function setStatusWorking()
     public function setStatusBroken($execTime=null)
     {
         $this->status = \G4\Tasker\Consts::STATUS_BROKEN;
+        $this->tsFinished = microtime(true);
         if ($execTime) {
             $this->execTime = $execTime;
         }
@@ -349,6 +372,7 @@ public function setStatusBroken($execTime=null)
     public function setStatusRetryFailed($execTime=null)
     {
         $this->status = \G4\Tasker\Consts::STATUS_RETRY_FAILED;
+        $this->tsFinished = microtime(true);
         if ($execTime) {
             $this->execTime = $execTime;
         }
@@ -357,6 +381,7 @@ public function setStatusRetryFailed($execTime=null)
     public function setStatusCompletedNotDone($execTime=null)
     {
         $this->status = \G4\Tasker\Consts::STATUS_COMPLETED_NOT_DONE;
+        $this->tsFinished = microtime(true);
         if ($execTime) {
             $this->execTime = $execTime;
         }
@@ -366,6 +391,7 @@ public function setStatusCompletedNotDone($execTime=null)
     public function setStatusDone($execTime=null)
     {
         $this->status = \G4\Tasker\Consts::STATUS_DONE;
+        $this->tsFinished = microtime(true);
         if ($execTime) {
             $this->execTime = $execTime;
         }
@@ -385,6 +411,7 @@ public function getQueueSource()
     public function setStatusWaitingForRetry($execTime=null)
     {
         $this->status = \G4\Tasker\Consts::STATUS_WAITING_FOR_RETRY;
+        $this->tsFinished = microtime(true);
         if ($execTime) {
             $this->execTime = $execTime;
         }

src/Tasker2/Injector.php

@@ -68,7 +68,8 @@ private function logStart()
         $this->startTime = microtime(true);
         $taskerStart = new \G4\Log\Data\TaskerStart();
         $taskerStart
-            ->setId($this->uniqueId);
+            ->setId($this->uniqueId)
+            ->setType(self::LOG_TYPE);
         $this->logger->log($taskerStart);
     }
 
@@ -82,4 +83,4 @@ private function logEnd()
         $this->logger->logAppend($taskerEnd);
     }
 
-}
+}

src/Tasker2/Runner.php

@@ -107,7 +107,7 @@ public function setProfiler(Profiler $profiler)
 
     public function clearProfilerData()
     {
-        $this->profiler->clearProfilers();
+        $this->profiler && $this->profiler->clearProfilers();
     }
 
     public function registerProfilerTicker(\G4\Profiler\Ticker\TickerAbstract $profiler)
@@ -126,9 +126,10 @@ public function execute()
         $this->taskDomain
             ->setStatusWorking()
             ->setIdentifier(gethostname())
-            ->setTsStarted(time());
+            ->setTsStarted(microtime(true));
 
         $this->logTaskStart();
+        $this->logTaskExecution(true);
         $this->logNewRelicStart();
 
         $task = $this->getTaskInstance();
@@ -151,12 +152,14 @@ public function execute()
         } catch (\Exception $e) {
             $this->taskerExecution->setOutput(ob_get_flush());
             $this->handleException($e);
+            $this->clearProfilerData();
             throw $e;
         }
 
         $this->timerStop();
         $this->taskDomain->setStatusDone($this->getTotalTime());
         $this->logTaskExecution();
+        $this->clearProfilerData();
     }
 
     /**
@@ -209,21 +212,24 @@ private function logTaskStart()
         $this->taskerExecution
             ->setId(md5(uniqid(microtime(), true)))
             ->setTask($this->taskDomain);
-        $this->logTaskExecution();
         return $this;
     }
 
-    private function logTaskExecution()
+    private function logTaskExecution($start = false)
     {
-        if ($this->profiler) {
+        $start
+            ? $this->taskerExecution->taskStarted()
+            : $this->taskerExecution->taskFinished();
+
+        if ($start && $this->profiler) {
             $this->taskerExecution->setProfiler($this->profiler);
         }
+
         if ($this->logger !== null) {
             $this->logger->log($this->taskerExecution);
+            $start === false && $this->logger->clearData();
         }
-        if ($this->profiler) {
-            $this->profiler->clearProfilers();
-        }
+
         return $this;
     }