From 1616f94b86412d0a96db3faa14179abe3212762e Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Thu, 5 Jan 2023 10:18:55 -0500
Subject: [PATCH] add ability to view error.log in System Info

---
 .../Modules/Admin/SystemInfo/Index.razor      | 32 +++++++++++++++----
 .../Modules/Admin/SystemInfo/Index.resx       | 11 ++++++-
 Oqtane.Server/Controllers/SystemController.cs | 10 ++++++
 3 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
index 38291a66..fc1160df 100644
--- a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
+++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
@@ -147,6 +147,16 @@
         <a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Access.ApiFramework"]</a>&nbsp;
         <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
     </TabPanel>
+    <TabPanel Name="Log" Heading="Log" ResourceKey="Log">
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="log" HelpText="System log information for current day" ResourceKey="Log">Log: </Label>
+                <div class="col-sm-9">
+                    <textarea id="log" class="form-control" rows="10" @bind="@_log" readonly />
+                </div>
+            </div>
+		</div>
+	</TabPanel>
 </TabStrip>
 <br /><br />
 
@@ -172,6 +182,8 @@
 	private string _swagger = string.Empty;
 	private string _packageservice = string.Empty;
 
+	private string _log = string.Empty;
+
 	protected override async Task OnInitializedAsync()
 	{
 		_version = Constants.Version;
@@ -191,19 +203,25 @@
 			_workingset = (Convert.ToInt64(systeminfo["WorkingSet"].ToString()) / 1000000).ToString() + " MB";
 		}
 
-		systeminfo = await SystemService.GetSystemInfoAsync();
+		systeminfo = await SystemService.GetSystemInfoAsync("configuration");
 		if (systeminfo != null)
 		{
 			_installationid = systeminfo["InstallationId"].ToString();
-            _detailederrors = systeminfo["DetailedErrors"].ToString();
-            _logginglevel = systeminfo["Logging:LogLevel:Default"].ToString();
-            _notificationlevel = systeminfo["Logging:LogLevel:Notify"].ToString();
-            _swagger = systeminfo["UseSwagger"].ToString();
-            _packageservice = systeminfo["PackageService"].ToString();
+			_detailederrors = systeminfo["DetailedErrors"].ToString();
+			_logginglevel = systeminfo["Logging:LogLevel:Default"].ToString();
+			_notificationlevel = systeminfo["Logging:LogLevel:Notify"].ToString();
+			_swagger = systeminfo["UseSwagger"].ToString();
+			_packageservice = systeminfo["PackageService"].ToString();
+		}
+
+		systeminfo = await SystemService.GetSystemInfoAsync("log");
+		if (systeminfo != null)
+		{
+			_log = systeminfo["Log"].ToString();
 		}
 	}
 
-    private async Task SaveConfig()
+	private async Task SaveConfig()
     {
         try
         {
diff --git a/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx b/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
index 9876218b..fc84a50a 100644
--- a/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
@@ -210,7 +210,10 @@
   <data name="Options.Heading" xml:space="preserve">
     <value>Options</value>
   </data>
-  <data name="Register" xml:space="preserve">
+  <data name="Log.Heading" xml:space="preserve">
+    <value>Log</value>
+  </data>
+    <data name="Register" xml:space="preserve">
     <value>Please Register Me For Major Product Updates And Security Bulletins</value>
   </data>
   <data name="Success.Register" xml:space="preserve">
@@ -276,4 +279,10 @@
   <data name="Environment.Text" xml:space="preserve">
     <value>Environment:</value>
   </data>
+  <data name="Log.Text" xml:space="preserve">
+    <value>Log:</value>
+  </data>
+  <data name="Log.HelpText" xml:space="preserve">
+    <value>System log information for current day</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Server/Controllers/SystemController.cs b/Oqtane.Server/Controllers/SystemController.cs
index efe0d9e8..6e77094d 100644
--- a/Oqtane.Server/Controllers/SystemController.cs
+++ b/Oqtane.Server/Controllers/SystemController.cs
@@ -6,6 +6,7 @@ using System;
 using Microsoft.AspNetCore.Hosting;
 using Oqtane.Infrastructure;
 using Microsoft.AspNetCore.Http.Features;
+using System.IO;
 
 namespace Oqtane.Controllers
 {
@@ -53,6 +54,15 @@ namespace Oqtane.Controllers
                     systeminfo.Add("UseSwagger", _configManager.GetSetting("UseSwagger", "true"));
                     systeminfo.Add("PackageService", _configManager.GetSetting("PackageService", "true"));
                     break;
+                case "log":
+                    string log = "";
+                    string path = Path.Combine(_environment.ContentRootPath, "Content", "Log", "error.log");
+                    if (System.IO.File.Exists(path))
+                    {
+                        log = System.IO.File.ReadAllText(path);
+                    }
+                    systeminfo.Add("Log", log);
+                    break;
             }
 
             return systeminfo;