Improves logging (#30)

* Updates ignored messages * Uses message output * Adds more ignored messages * Adds detail of output * Apply fixes from StyleCI (#31)
laravel · Oct 22, 2020 · 166ab0c · 166ab0c
1 parent e95c9a7
commit 166ab0c
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/app.js b/public/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,4 +1,4 @@
 {
-    "/app.js": "/app.js?id=4cd65553f3baa40505e0",
+    "/app.js": "/app.js?id=ee4113d2e671858c7982",
     "/app.css": "/app.css?id=ac312744bf7a06265c21"
 }
diff --git a/resources/js/screens/logs/index.vue b/resources/js/screens/logs/index.vue
@@ -31,7 +31,15 @@
                 <div class="ml-4">
                     <div class="text-sm leading-5 font-medium text-gray-900 truncate">
                         <p class="truncate">
-                            {{ entry.content.message.message ? entry.content.message.message : entry.content.message }}
+                            <template v-if="entry.content.message.message">
+                                {{ entry.content.message.message }}
+                            </template>
+                            <template v-else-if="entry.content.message.output">
+                                {{ entry.content.message.output }}
+                            </template>
+                            <template v-else>
+                                {{ entry.content.message }}
+                            </template>
                         </p>
                     </div>
                     <div

diff --git a/resources/js/screens/logs/show.vue b/resources/js/screens/logs/show.vue
@@ -53,7 +53,20 @@
                 </dd>
             </div>
 
-            <div class="mt-8 sm:mt-0 sm:grid sm:grid-cols-3 sm:gap-4 sm:border-t sm:border-gray-200 sm:px-6 sm:py-5">
+            <div
+                v-if="entry.content.message.context && entry.content.message.context.command"
+                class="mt-8 sm:mt-0 sm:grid sm:grid-cols-3 sm:gap-4 sm:border-t sm:border-gray-200 sm:px-6 sm:py-5"
+            >
+                <dt class="text-sm leading-5 font-medium text-gray-500">Command</dt>
+                <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                    {{ entry.content.message.context.command }}
+                </dd>
+            </div>
+
+            <div
+                v-if="!entry.content.message.output"
+                class="mt-8 sm:mt-0 sm:grid sm:grid-cols-3 sm:gap-4 sm:border-t sm:border-gray-200 sm:px-6 sm:py-5"
+            >
                 <dt class="text-sm leading-5 font-medium text-gray-500">Message</dt>
                 <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
                     {{ entry.content.message.message ? entry.content.message.message : entry.content.message }}
@@ -65,7 +78,12 @@
             >
                 <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
                     <div class="border border-gray-200 rounded-md bg-gray-900 text-white overflow-x-auto">
+                        <pre v-if="entry.content.message.output" class="m-4 3rem">
+                            {{ entry.content.message.output.trim() }}
+                        </pre>
+
                         <vue-json-pretty
+                            v-else
                             class="m-4 3rem"
                             :showLine="false"
                             :deep="4"

diff --git a/src/Repositories/LogsRepository.php b/src/Repositories/LogsRepository.php
@@ -23,14 +23,23 @@ class LogsRepository
      * @var array
      */
     protected $ignore = [
+        'Creating storage directory',
         'START RequestId',
         'REPORT RequestId',
         'END RequestId',
         'Executing warming requests',
-        'Loaded Composer autoload filePreparing to add secrets to runtimePreparing to boot FPMEnsuring ready to start FPMStarting FPM Process',
+        'Loaded Composer autoload file',
+        'Preparing to add secrets to runtime',
+        'Preparing to boot FPM',
+        'Ensuring ready to start FPM',
+        'Starting FPM Process',
         'NOTICE: fpm is running,',
         'NOTICE: ready to handle connections',
         'Caching Laravel configuration',
+        'NOTICE: exiting, bye-bye!',
+        'NOTICE: Terminating',
+        'Injecting secret',
+        'Killing container. Container has processed',
     ];
 
     /**