andreitdr/SethDiscordBot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated logger for real time message sending

Browse Source
This commit is contained in:
Andrei Tudor
2025-05-06 13:57:12 +03:00
parent 3a7bd53cfc
commit 3e4709148f
6 changed files with 59 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DiscordBotCore.Logging/ILogger.cs
View File

@@ -2,21 +2,13 @@
public interface ILogger
{
public struct FormattedMessage {
public string Message;
public LogType Type;
}
string LogMessageFormat { get; set; }
event Action<ILogMessage>? OnLogReceived;
void Log(string message);
void Log(string message, LogType logType);
void Log(string message, LogType logType, string format);
void Log(string message, object Sender);
void Log(string message, object Sender, LogType type);
void LogException(Exception exception, object Sender, bool logFullStack = false);
void SetOutFunction(Action<string,LogType> outFunction);
string GetLogsHistory();
void Log(string message, object sender);
void Log(string message, object sender, LogType type);
void LogException(Exception exception, object sender, bool logFullStack = false);
}

55
DiscordBotCore.Logging/Logger.cs
View File

@@ -2,23 +2,15 @@
public sealed class Logger : ILogger
{
private FileStream _logFileStream;
private readonly List<string> _logMessageProperties = typeof(ILogMessage).GetProperties().Select(p => p.Name).ToList();
private Action<string, LogType>? _outFunction;
private readonly string _LogFile;
private readonly List<string> _logMessageProperties = typeof(ILogMessage).GetProperties().Select(p => p.Name).ToList();
public event Action<ILogMessage>? OnLogReceived;
public string LogMessageFormat { get ; set; }
public Logger(string logFolder, string logMessageFormat, Action<string, LogType>? outFunction = null)
public Logger(string logFolder, string logMessageFormat)
{
this.LogMessageFormat = logMessageFormat;
var logFile = Path.Combine(logFolder, $"{DateTime.Now:yyyy-MM-dd}.log");
_logFileStream = File.Open(logFile, FileMode.Append, FileAccess.Write, FileShare.Read);
this._outFunction = outFunction ?? DefaultLogFunction;
}
private void DefaultLogFunction(string message, LogType logType)
{
Console.WriteLine($"[{logType}] {message}");
this._LogFile = Path.Combine(logFolder, $"{DateTime.Now:yyyy-MM-dd}.log");
}
/// <summary>
@@ -38,15 +30,10 @@ public sealed class Logger : ILogger
return messageAsString;
}
private async void LogToFile(string message)
private async Task LogToFile(string message)
{
byte[] messageAsBytes = System.Text.Encoding.ASCII.GetBytes(message);
await _logFileStream.WriteAsync(messageAsBytes, 0, messageAsBytes.Length);
byte[] newLine = System.Text.Encoding.ASCII.GetBytes(Environment.NewLine);
await _logFileStream.WriteAsync(newLine, 0, newLine.Length);
await _logFileStream.FlushAsync();
await using var streamWriter = new StreamWriter(_LogFile, true);
await streamWriter.WriteLineAsync(message);
}
private string GenerateLogMessage(ILogMessage message, string customFormat)
@@ -61,17 +48,17 @@ public sealed class Logger : ILogger
return messageAsString;
}
public void Log(ILogMessage message, string format)
private void Log(ILogMessage message, string format)
{
string messageAsString = GenerateLogMessage(message, format);
_outFunction?.Invoke(messageAsString, message.LogMessageType);
OnLogReceived?.Invoke(message);
LogToFile(messageAsString);
}
public void Log(ILogMessage message)
private void Log(ILogMessage message)
{
string messageAsString = GenerateLogMessage(message);
_outFunction?.Invoke(messageAsString, message.LogMessageType);
OnLogReceived?.Invoke(message);
LogToFile(messageAsString);
}
@@ -82,22 +69,4 @@ public sealed class Logger : ILogger
public void Log(string message, object sender) => Log(new LogMessage(message, sender));
public void Log(string message, object sender, LogType type) => Log(new LogMessage(message, sender, type));
public void LogException(Exception exception, object sender, bool logFullStack = false) => Log(LogMessage.CreateFromException(exception, sender, logFullStack));
public void SetOutFunction(Action<string, LogType> outFunction)
{
this._outFunction = outFunction;
}
public string GetLogsHistory()
{
string fileName = _logFileStream.Name;
//_logFileStream.Flush();
_logFileStream.Close();
string[] logs = File.ReadAllLines(fileName);
_logFileStream = File.Open(fileName, FileMode.Append, FileAccess.Write, FileShare.Read);
return string.Join(Environment.NewLine, logs);
}
}

5
DiscordBotCore.WebApplication/Initializer.cs
View File

@@ -29,7 +29,10 @@ public static class Initializer
Directory.CreateDirectory(logFolder);
ILogger logger = new Logger(logFolder, logFormat);
logger.SetOutFunction((s, type) => { Console.WriteLine($"[{type}] {s}"); });
logger.OnLogReceived += (logMessage) =>
{
Console.WriteLine(logMessage.Message);
};
return logger;
});

75
WebUI/Components/Pages/Home.razor
View File

@@ -1,13 +1,16 @@
@page "/"
@using DiscordBotCore.Bot
@using DiscordBotCore.Logging
@using DiscordBotCore.PluginManagement.Loading
@using WebUI.Models
@using WebUI.Services
@inject IDiscordBotApplication DiscordBotApplication
@inject IPluginLoader PluginLoader
@inject DiscordBotCore.Logging.ILogger Logger
@inject ILogger Logger
@inject IJSRuntime JS
@inject NotificationService NotificationService
@rendermode InteractiveServer
<h3>Console Log Viewer</h3>
@@ -16,9 +19,9 @@
<div class="col-md-8">
<h4>Console Log</h4>
<div id="consoleLog" class="border p-3 bg-dark text-white" style="height: 400px; overflow-y: auto; font-family: monospace;">
@foreach (var line in Logs)
@foreach (var line in _Logs)
{
<div style="@GetLogStyle(line)">@line</div>
<div style="@GetLogStyle(line)">@line.Message</div>
}
</div>
</div>
@@ -44,16 +47,22 @@
@code {
private bool IsRunning { get; set; }
private List<string> Logs { get; set; } = new();
private Timer? _logTimer;
private int _lastLogCount = 0;
private readonly object _logLock = new();
private List<ILogMessage> _Logs { get; set; } = new();
protected override void OnInitialized()
{
IsRunning = DiscordBotApplication.IsReady;
_logTimer = new Timer(async _ => await RefreshLogsAsync(), null, 0, 2000);
Logger.OnLogReceived += LoggerOnLogReceived;
}
private void LoggerOnLogReceived(ILogMessage obj)
{
InvokeAsync(async () =>
{
_Logs.Add(obj);
StateHasChanged();
await JS.InvokeVoidAsync("scrollToBottom", "consoleLog");
});
}
private async Task StartApplication()
@@ -62,7 +71,9 @@
{
await DiscordBotApplication.StartAsync();
Logger.Log("Application started", this);
NotificationService.Notify("Bot Started !", NotificationType.Success);
}
IsRunning = DiscordBotApplication.IsReady;
}
@@ -72,7 +83,9 @@
{
await DiscordBotApplication.StopAsync();
Logger.Log("Application stopped", this);
NotificationService.Notify("Bot Stopped !", NotificationType.Success);
}
IsRunning = DiscordBotApplication.IsReady;
}
@@ -85,43 +98,15 @@
}
private string GetLogStyle(string line)
private string GetLogStyle(ILogMessage logMessage)
{
if (line.Contains("[Error]")) return "color: #ff4d4d;";
if (line.Contains("[Warning]")) return "color: #ffa500;";
if (line.Contains("[Debug]")) return "color: #88f;";
return "";
}
private async Task RefreshLogsAsync()
{
try
return logMessage.LogMessageType switch
{
var logText = Logger.GetLogsHistory();
var newLogs = logText.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries);
if (newLogs.Length != _lastLogCount)
{
lock (_logLock)
{
Logs = newLogs.ToList();
_lastLogCount = newLogs.Length;
}
await InvokeAsync(async () =>
{
StateHasChanged();
await JS.InvokeVoidAsync("scrollToBottom", "consoleLog");
});
}
}
catch (Exception ex)
{
}
}
public void Dispose()
{
_logTimer?.Dispose();
LogType.Info => "color: white;",
LogType.Warning => "color: yellow;",
LogType.Error => "color: red;",
LogType.Critical => "color: purple;",
_ => ""
};
}
}

7
WebUI/Components/Pages/Plugins/AddLocal.razor
View File

@@ -5,8 +5,11 @@
@using DiscordBotCore.Logging
@using DiscordBotCore.PluginManagement
@using DiscordBotCore.PluginManagement.Models
@using WebUI.Models
@using WebUI.Services
@inject NavigationManager Navigation
@inject NotificationService NotificationService
@inject IPluginManager PluginManager
@inject IConfiguration Configuration
@@ -67,6 +70,7 @@
{
if (!IsValidVersion || selectedFile is null || string.IsNullOrEmpty(selectedFileName))
{
NotificationService.Notify("Invalid field values. Please check the form.", NotificationType.Error);
return;
}
@@ -75,6 +79,7 @@
if (string.IsNullOrEmpty(pluginsFolder))
{
Logger.Log("Plugins folder is not set in the configuration.", this, LogType.Error);
NotificationService.Notify("Plugins folder is not set in the configuration.", NotificationType.Error);
return;
}
@@ -86,6 +91,8 @@
LocalPlugin plugin = new LocalPlugin(pluginModel.Name, pluginModel.Version, filePath, new(), true, pluginModel.IsEnabled);
await PluginManager.AppendPluginToDatabase(plugin);
NotificationService.Notify($"Plugin {pluginModel.Name} uploaded successfully!", NotificationType.Success);
Navigation.NavigateTo("/");
}

1
WebUI/Components/Pages/Plugins/Online.razor
View File

@@ -130,6 +130,7 @@ else
if (pluginData is null)
{
Logger.Log("Plugin data is null.", this, LogType.Error);
NotificationService.Notify("Plugin data is null.", NotificationType.Error);
return;
}