From 7a74ff39e7cd1e0b8b0eec43bd8707ca3c797a05 Mon Sep 17 00:00:00 2001 From: im-bravo <44688499+im-bravo@users.noreply.github.com> Date: Tue, 25 Dec 2018 11:16:17 +0800 Subject: [PATCH 1/5] Update LogViewer.php support microtime --- src/LogViewer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LogViewer.php b/src/LogViewer.php index 96eef0c..8bf8f15 100644 --- a/src/LogViewer.php +++ b/src/LogViewer.php @@ -317,8 +317,8 @@ protected function renderTableRow($log) */ protected function parseLog($raw) { - $logs = preg_split('/\[(\d{4}(?:-\d{2}){2} \d{2}(?::\d{2}){2})\] (\w+)\.(\w+):((?:(?!{"exception").)*)?/', trim($raw), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); - + $logs = preg_split('/\[(\d{4}(?:-\d{2}){2} \d{2}(?::\d{2}){2}\.\d+|\d{4}(?:-\d{2}){2} \d{2}(?::\d{2}){2})\] (\w+)\.(\w+):((?:(?!{"exception").)*)?/', trim($raw), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); + foreach ($logs as $index => $log) { if (preg_match('/^\d{4}/', $log)) { break; From f788e1efd7c6c1e3a6f03ee21e0a791d1d81497b Mon Sep 17 00:00:00 2001 From: im-bravo <44688499+im-bravo@users.noreply.github.com> Date: Tue, 25 Dec 2018 11:17:54 +0800 Subject: [PATCH 2/5] Update logs.blade.php --- resources/views/logs.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/logs.blade.php b/resources/views/logs.blade.php index 58b5c1b..c9ba9a6 100644 --- a/resources/views/logs.blade.php +++ b/resources/views/logs.blade.php @@ -115,7 +115,7 @@ function fetch() { {{ $log['level'] }} {{ $log['env'] }} - {{ $log['time'] }} + {{ $log['time'] }} {{ $log['info'] }} @if(!empty($log['trace'])) @@ -181,4 +181,4 @@ function fetch() { - \ No newline at end of file + From 946eee55f9f04206d9d795edba2ee22a9cd48e43 Mon Sep 17 00:00:00 2001 From: im-bravo <44688499+im-bravo@users.noreply.github.com> Date: Tue, 25 Dec 2018 11:23:34 +0800 Subject: [PATCH 3/5] Update logs.blade.php From af3b94f6938c67558d50511eaf1b3c8e15aa4337 Mon Sep 17 00:00:00 2001 From: im-bravo <44688499+im-bravo@users.noreply.github.com> Date: Tue, 25 Dec 2018 11:27:06 +0800 Subject: [PATCH 4/5] Update LogViewer.php --- src/LogViewer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LogViewer.php b/src/LogViewer.php index 8bf8f15..e2ea8a1 100644 --- a/src/LogViewer.php +++ b/src/LogViewer.php @@ -318,7 +318,7 @@ protected function renderTableRow($log) protected function parseLog($raw) { $logs = preg_split('/\[(\d{4}(?:-\d{2}){2} \d{2}(?::\d{2}){2}\.\d+|\d{4}(?:-\d{2}){2} \d{2}(?::\d{2}){2})\] (\w+)\.(\w+):((?:(?!{"exception").)*)?/', trim($raw), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); - + foreach ($logs as $index => $log) { if (preg_match('/^\d{4}/', $log)) { break; From 6fce3ff8bc6c8149bf0896cfc037a44fccbcaa31 Mon Sep 17 00:00:00 2001 From: im-bravo <44688499+im-bravo@users.noreply.github.com> Date: Mon, 4 Mar 2019 13:55:51 +0800 Subject: [PATCH 5/5] Update LogViewer.php timeout --- src/LogViewer.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/LogViewer.php b/src/LogViewer.php index e2ea8a1..78a5fd5 100644 --- a/src/LogViewer.php +++ b/src/LogViewer.php @@ -30,7 +30,10 @@ class LogViewer extends Extension * * @var array */ - protected $pageOffset = []; + protected $pageOffset = [ + 'start' => 0, + 'end' => 0, + ]; /** * @var array @@ -169,6 +172,9 @@ public function getNextPageUrl() */ public function fetch($seek = 0, $lines = 20, $buffer = 4096) { + if (!is_file($this->filePath)) { + return $this->parseLog(""); + } $f = fopen($this->filePath, 'rb'); if ($seek) {