- Added microtime to logs.

- Minor improvements.
NeoRazorX · Oct 5, 2019 · 9056cb4 · 9056cb4
1 parent c54ae24
commit 9056cb4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/Core/Base/Debug/DebugBar.php b/Core/Base/Debug/DebugBar.php
@@ -150,19 +150,21 @@ private function addItemLogs(array &$items)
     {
         $channels = [];
 
+        $lastMicrotime = self::$init[''];
         $logger = new MiniLog();
         foreach ($logger->readAll(MiniLog::ALL_LEVELS) as $log) {
             if (!isset($channels[$log['channel']])) {
                 $channels[$log['channel']] = [
                     'label' => $log['channel'],
-                    'data' => [
-                        ['level' => $log['level'], 'message' => $log['message']]
-                    ]
+                    'data' => []
                 ];
-                continue;
             }
 
-            $channels[$log['channel']]['data'][] = ['level' => $log['level'], 'message' => $log['message']];
+            $diff = $log['microtime'] - $lastMicrotime;
+            $channels[$log['channel']]['data'][] = [
+                'level' => $log['level'], 'message' => $log['message'], 'time' => number_format($diff * 1000) . 'ms'
+            ];
+            $lastMicrotime = $log['microtime'];
         }
 
         foreach ($channels as $channel) {

diff --git a/Core/Base/MiniLog.php b/Core/Base/MiniLog.php
@@ -186,6 +186,7 @@ protected function log(string $level, string $message, array $context = [])
                 'context' => $context,
                 'level' => $level,
                 'message' => $message,
+                'microtime' => microtime(true),
                 'time' => time(),
             ];
         }

diff --git a/Core/Lib/ExtendedController/ListView.php b/Core/Lib/ExtendedController/ListView.php
@@ -129,19 +129,10 @@ public function addOrderBy(array $fields, $label, $default = 0)
             'type' => 'DESC',
         ];
 
-        switch ($default) {
-            case 1:
-                $this->setSelectedOrderBy($key1);
-                break;
-
-            case 2:
-                $this->setSelectedOrderBy($key2);
-                break;
-
-            default:
-                if (empty($this->order)) {
-                    $this->setSelectedOrderBy($key1);
-                }
+        if ($default === 2) {
+            $this->setSelectedOrderBy($key2);
+        } elseif ($default === 1 || empty($this->order)) {
+            $this->setSelectedOrderBy($key1);
         }
     }