From 32d39cdc1caf55d439c85517ec2b8882d9da3924 Mon Sep 17 00:00:00 2001
From: James Collins <james.collins@outlook.com.au>
Date: Fri, 3 Feb 2023 11:17:19 +1000
Subject: [PATCH] add split logs

---
 app/Http/Controllers/Api/LogController.php    | 25 +++++++--
 .../js/views/dashboard/DiscordBotLog.vue      | 51 ++++++++++++-------
 2 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/Api/LogController.php b/app/Http/Controllers/Api/LogController.php
index 257a7c7..c2c5fd0 100644
--- a/app/Http/Controllers/Api/LogController.php
+++ b/app/Http/Controllers/Api/LogController.php
@@ -26,14 +26,33 @@ class LogController extends ApiController
         if($request->user()?->hasPermission('logs/' . $name)) {
             switch(strtolower($name)) {
                 case 'discord':
-                    $contents = '';
+                    $outputContents = '';
+                    $errorContents = '';
+
+                    // output log
                     $filePath = '/home/discordbot/.pm2/logs/stemmech-discordbot-out-0.log';
                     if(file_exists($filePath) === true) {
-                        $contents = file_get_contents($filePath);
+                        $outputContents = file_get_contents($filePath);
                     }
 
                     $lines = preg_split("/(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}: (?:(?!\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}: )[\s\S])*)/", $contents, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-                    return $this->respondJson(['log' => implode('', array_reverse($lines))]);
+                    $outputContents = implode('', array_reverse($lines));
+                    
+                    // error log
+                    $filePath = '/home/discordbot/.pm2/logs/stemmech-discordbot-error-0.log';
+                    if(file_exists($filePath) === true) {
+                        $outputContents = file_get_contents($filePath);
+                    }
+
+                    $lines = preg_split("/(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}: (?:(?!\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}: )[\s\S])*)/", $contents, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+                    $errorContents = implode('', array_reverse($lines));
+
+                    return $this->respondJson([
+                        'log' => [
+                            'output' => $outputContents,
+                            'errors' => $errorContents,
+                        ]
+                    ]);
             }
         }
 
diff --git a/resources/js/views/dashboard/DiscordBotLog.vue b/resources/js/views/dashboard/DiscordBotLog.vue
index 58665a0..0699516 100644
--- a/resources/js/views/dashboard/DiscordBotLog.vue
+++ b/resources/js/views/dashboard/DiscordBotLog.vue
@@ -1,47 +1,64 @@
 <template>
     <SMContainer :loading="formLoading" permission="logs/discord">
-        <h1>Discord Bot Log</h1>
+        <h1>Discord Bot Logs</h1>
         <SMMessage
-            v-if="formMessage.message"
-            :icon="formMessage.icon"
-            :type="formMessage.type"
-            :message="formMessage.message" />
-        <code v-if="logContent.length > 0">{{ logContent }}</code>
-        <SMButton label="Reload" @click="loadData" />
+            v-if="message.message"
+            :icon="message.icon"
+            :type="message.type"
+            :message="message.message" />
+        <SMTabGroup>
+            <SMTab label="Output">
+                <code v-if="logOutputContent.length > 0">{{
+                    logOutputContent
+                }}</code>
+            </SMTab>
+            <SMTab label="Errors">
+                <code v-if="logErrorContent.length > 0">{{
+                    logErrorContent
+                }}</code>
+            </SMTab>
+        </SMTabGroup>
+        <SMButton label="Reload Logs" @click="loadData" />
     </SMContainer>
 </template>
 
 <script setup lang="ts">
 import { ref, reactive } from "vue";
 import SMButton from "../../components/SMButton.vue";
+import SMTabGroup from "../../components/SMTabGroup.vue";
+import SMTab from "../../components/SMTab.vue";
 import SMMessage from "../../components/SMMessage.vue";
 import axios from "axios";
 
 let formLoading = ref(false);
-let logContent = ref("");
-const formMessage = reactive({
+let logOutputContent = ref("");
+let logErrorContent = ref("");
+const message = reactive({
     icon: "",
     type: "",
     message: "",
 });
 
 const loadData = async () => {
-    formMessage.icon = "";
-    formMessage.type = "error";
-    formMessage.message = "";
+    message.icon = "";
+    message.type = "error";
+    message.message = "";
 
     try {
         formLoading.value = true;
         let res = await axios.get(`logs/discord`);
 
-        //console.log(res.data.log.split(/2023-02-03T00:23:40: /));
+        logOutputContent.value = res.data.log.output;
+        if (logOutputContent.value.length === 0) {
+            logOutputContent.value = "Log file is empty";
+        }
 
-        logContent.value = res.data.log;
-        if (logContent.value.length === 0) {
-            formMessage.message = "Log file is empty";
+        logErrorContent.value = res.data.log.errors;
+        if (logErrorContent.value.length === 0) {
+            logErrorContent.value = "Log file is empty";
         }
     } catch (err) {
-        formMessage.message = "Could not load log from server";
+        message.message = "Could not load logs from server";
     }
 
     formLoading.value = false;