patch

lbr38 · Dec 23, 2024 · ff20026 · ff20026
1 parent 23ef9ef
commit ff20026
Show file tree

Hide file tree

Showing 16 changed files with 224 additions and 133 deletions.
diff --git a/www/controllers/Common.php b/www/controllers/Common.php
@@ -219,7 +219,7 @@ public function randomColor()
     }
 
     /**
-     *  Convertit une durée microtime au format HHhMMmSSs
+     *  Converts a microtime duration to a time format HHhMMmSSs
      */
     public static function convertMicrotime(string $duration)
     {
@@ -239,9 +239,21 @@ public static function convertMicrotime(string $duration)
             $time .= $seconds . 's';
         }
 
+        if (empty($time)) {
+            $time = '0s';
+        }
+
         return $time;
     }
 
+    /**
+     *  Converts a microtime to a time format
+     */
+    public static function microtimeToTime(string $microtime)
+    {
+        return date('H:i:s', $microtime);
+    }
+
     /**
      *  Tri un array par la valeur de clé spécifiée
      */

diff --git a/www/controllers/Logging/Step.php b/www/controllers/Logging/Step.php
@@ -46,7 +46,7 @@ public function completed(string|null $message = null)
         $content['steps'][$name]['end'] = microtime(true);
 
         // Set duration
-        $content['steps'][$name]['duration'] = \Controllers\Common::convertMicrotime(microtime(true) - $content['steps'][$name]['start']);
+        $content['steps'][$name]['duration'] = microtime(true) - $content['steps'][$name]['start'];
 
         // Set message if any
         if (!empty($message)) {
@@ -75,21 +75,21 @@ public function error(string $message)
         $content['steps'][$name]['end'] = microtime(true);
 
         // Set duration
-        $content['steps'][$name]['duration'] = \Controllers\Common::convertMicrotime(microtime(true) - $content['steps'][$name]['start']);
+        $content['steps'][$name]['duration'] = microtime(true) - $content['steps'][$name]['start'];
 
-        // Set error-message if not already set
-        if (empty($content['steps'][$name]['error-message'])) {
-            $content['steps'][$name]['error-message'] = $message;
-        }
+        // Set error-message
+        $content['steps'][$name]['error-message'] = 'Failed';
 
-        // Also set latest sub step on error, unless it has 'completed' status
+        // Also set latest sub step on error
         $subStepName = array_key_last($content['steps'][$name]['substeps']);
 
         if (isset($content['steps'][$name]['substeps'][$subStepName]['status'])) {
-            if ($content['steps'][$name]['substeps'][$subStepName]['status'] !== 'completed') {
-                $content['steps'][$name]['substeps'][$subStepName]['status'] = 'error';
-                $content['steps'][$name]['substeps'][$subStepName]['error-message'] = $message;
-            }
+            $content['steps'][$name]['substeps'][$subStepName]['status'] = 'error';
+            $content['steps'][$name]['substeps'][$subStepName]['output'][] = [
+                'time' => microtime(true),
+                'type' => 'error',
+                'message' => $message
+            ];
         }
 
         file_put_contents($this->logFile, json_encode($content));

diff --git a/www/controllers/Logging/SubStep.php b/www/controllers/Logging/SubStep.php
@@ -18,6 +18,9 @@ public function new(string $identifier, array $data)
             'title' => '',
             'note' => '',
             'status' => '',
+            'start' => microtime(true),
+            'end' => '',
+            'duration' => '',
             'output' => []
         ];
 
@@ -53,6 +56,12 @@ public function completed(string|null $message = '')
         // Set status to completed
         $content['steps'][$name]['substeps'][$subName]['status'] = 'completed';
 
+        // Set end date
+        $content['steps'][$name]['substeps'][$subName]['end'] = microtime(true);
+
+        // Set duration
+        $content['steps'][$name]['substeps'][$subName]['duration'] = microtime(true) - $content['steps'][$name]['substeps'][$subName]['start'];
+
         file_put_contents($this->logFile, json_encode($content));
 
         unset($content);
@@ -63,6 +72,8 @@ public function completed(string|null $message = '')
      */
     public function warning(string $message)
     {
+        $this->output($message, 'warning');
+
         $content = $this->getContent();
 
         // Get latest step key name
@@ -74,8 +85,11 @@ public function warning(string $message)
         // Set status to warning
         $content['steps'][$name]['substeps'][$subName]['status'] = 'warning';
 
-        // Set message
-        $content['steps'][$name]['substeps'][$subName]['message'] = $message;
+        // Set end date
+        $content['steps'][$name]['substeps'][$subName]['end'] = microtime(true);
+
+        // Set duration
+        $content['steps'][$name]['substeps'][$subName]['duration'] = microtime(true) - $content['steps'][$name]['substeps'][$subName]['start'];
 
         file_put_contents($this->logFile, json_encode($content));