This commit is contained in:
2022-12-15 21:32:33 +01:00
parent f8659ad197
commit 5d3c85ffd3
10 changed files with 170 additions and 109 deletions

View File

@@ -4,6 +4,7 @@ using EonaCat.Logger.Syslog;
using Microsoft.Extensions.Logging;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
@@ -207,9 +208,34 @@ namespace EonaCat.logger.Managers
{
try
{
System.IO.StreamWriter file = new System.IO.StreamWriter($"{settings.FileLoggerOptions.LogDirectory}{Path.DirectorySeparatorChar}{settings.FileLoggerOptions.FileNamePrefix}_{DateTime.Now.ToString("yyyyMMdd")}.log", true);
file.Write(message + Environment.NewLine);
file.Close();
if (logType == ELogType.CRITICAL)
{
logger.LogCritical(message);
}
else if (logType == ELogType.DEBUG)
{
logger.LogDebug(message);
}
else if (logType == ELogType.ERROR)
{
logger.LogError(message);
}
else if (logType == ELogType.INFO)
{
logger.LogInformation(message);
}
else if (logType == ELogType.TRACE)
{
logger.LogTrace(message);
}
else if (logType == ELogType.TRAFFIC)
{
logger.LogTrace($"[TRAFFIC] {message}");
}
else if (logType == ELogType.WARNING)
{
logger.LogWarning(message);
}
completed = true;
}
catch (Exception exc)
@@ -219,37 +245,7 @@ namespace EonaCat.logger.Managers
if (tries >= maxTries)
throw;
}
}
return;
if (logType == ELogType.CRITICAL)
{
logger.LogCritical(message);
}
else if (logType == ELogType.DEBUG)
{
logger.LogDebug(message);
}
else if (logType == ELogType.ERROR)
{
logger.LogError(message);
}
else if (logType == ELogType.INFO)
{
logger.LogInformation(message);
}
else if (logType == ELogType.TRACE)
{
logger.LogTrace(message);
}
else if (logType == ELogType.TRAFFIC)
{
logger.LogTrace($"[TRAFFIC] {message}");
}
else if (logType == ELogType.WARNING)
{
logger.LogWarning(message);
}
}
}
}
@@ -257,10 +253,13 @@ namespace EonaCat.logger.Managers
{
if (settings == null) return;
if (!settings.SendToSyslogServers) return;
if (settings.SysLogServers == null) return;
if (!settings.SysLogServers.Any()) return;
if (string.IsNullOrWhiteSpace(message)) return;
if (settings.SysLogServers == null || !settings.SysLogServers.Any())
{
settings.SysLogServers = new List<SyslogServer> { new SyslogServer("127.0.0.1", 514) };
}
byte[] data = Encoding.UTF8.GetBytes(message);
var sysLogServers = settings.SysLogServers.ToList();