fix logs preg.

tanwencn · Apr 27, 2020 · eb12824 · eb12824
1 parent dbfedd8
commit eb12824
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/resources/views/_log_views/index.blade.php b/resources/views/_log_views/index.blade.php
@@ -123,7 +123,7 @@
                                     </code>
                                 </td>
                                 <td>
-                                    @if(!empty(trim($val[5])))
+                                    @if(isset($val[5]) && !empty(trim($val[5])))
                                         <button type="button" class="btn btn-xs btn-primary" data-toggle="modal"
                                                 data-target="#modal-default{{ $key }}"> View
                                         </button>
@@ -134,7 +134,7 @@
                                 <div class="modal-dialog">
                                     <div class="modal-content">
                                         <div class="modal-body">
-                                            <pre><code>{{ $val[4].$val[5] }}</code></pre>
+                                            <pre><code>{{ $val[4].(isset($val[5])?$val[5]:"") }}</code></pre>
                                         </div>
                                     </div>
                                     <!-- /.modal-content -->

diff --git a/src/Http/Controllers/LogViewController.php b/src/Http/Controllers/LogViewController.php
@@ -73,7 +73,7 @@ protected function data(SplFileInfo $file)
 
         while ($this->eof = $file->valid()) {
             $line = $file->fgets() . "\n";
-            if ($once_rows > config('admin.laravel_logs.read_once_rows', 10000) && preg_match('/\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\].*/', $line)) {
+            if ($once_rows > config('admin.laravel_logs.read_once_rows', 10000) && preg_match('/\[\d{4}-\d{2}-\d{2}.*\].*/', $line)) {
                 if (!$this->isRefresh()) {
                     session(['log_view_line_last' => $this->rows_line]);
                     session(['log_view_line' => $file->key()-1]);
@@ -86,16 +86,16 @@ protected function data(SplFileInfo $file)
             $once_rows++;
         }
 
-        preg_match_all('/\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\].*/', $content, $headings);
-        $log_data = preg_split('/\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\].*/', $content, null);
+        preg_match_all('/\[\d{4}-\d{2}-\d{2}.*\].*/', $content, $headings);
+        $log_data = preg_split('/\[\d{4}-\d{2}-\d{2}.*\].*/', $content, null);
         if ($log_data[0] < 1)
             array_shift($log_data);
 
         $headings = array_shift($headings);
 
         $results = [];
         foreach ($headings as $key => $heading){
-            preg_match('/^\[(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})\] (.+?)\.(.+?): (.*)/', $heading, $results[$key]);
+            preg_match('/^\[(\d{4}-\d{2}-\d{2}.+\d)\] (.+?)\.(.+?): (.*)/', trim($heading), $results[$key]);
             array_push($results[$key], $log_data[$key]);
         }