Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-08-05 03:18:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update to Kettu 1.1.0

Browse source
This commit is contained in:
jvyden 2021-10-27 01:31:56 -04:00
commit 367d6795ae
No known key found for this signature in database
GPG key ID: 18BCF2BE0262B278
4 changed files with 21 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ProjectLighthouse/Logging/AspNetToKettuLogger.cs
View file

@ -12,17 +12,7 @@ namespace LBPUnion.ProjectLighthouse.Logging {
public bool IsEnabled(LogLevel logLevel) => true; public bool IsEnabled(LogLevel logLevel) => true;
public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter) { public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter) {
LoggerLevel loggerLevel = logLevel switch { LoggerLevel loggerLevel = new LoggerLevelAspNet(logLevel);
LogLevel.Trace => LoggerLevelAspNetTrace.Instance,
LogLevel.Debug => LoggerLevelAspNetDebug.Instance,
LogLevel.Information => LoggerLevelAspNetInformation.Instance,
LogLevel.Warning => LoggerLevelAspNetWarning.Instance,
LogLevel.Error => LoggerLevelAspNetError.Instance,
LogLevel.Critical => LoggerLevelAspNetCritical.Instance,
LogLevel.None => LoggerLevelAspNetNone.Instance,
_ => throw new ArgumentOutOfRangeException(nameof(logLevel), logLevel, null),
};
Logger.Log(state.ToString(), loggerLevel); Logger.Log(state.ToString(), loggerLevel);
if(exception == null) return; if(exception == null) return;

11
ProjectLighthouse/Logging/LighthouseFileLogger.cs
View file

@ -9,9 +9,14 @@ namespace LBPUnion.ProjectLighthouse.Logging {
public override void Send(LoggerLine line) { public override void Send(LoggerLine line) {
FileHelper.EnsureDirectoryCreated(logsDirectory); FileHelper.EnsureDirectoryCreated(logsDirectory);
File.AppendAllText(Path.Combine(logsDirectory, line.LoggerLevel + ".log"), line.LineData + "\n"); string channel = string.IsNullOrEmpty(line.LoggerLevel.Channel) ? "" : $"[{line.LoggerLevel.Channel}] ";
File.AppendAllText(Path.Combine(logsDirectory, "all.log"), line.LineData + "\n");
string contentFile = $"{channel}{line.LineData}\n";
string contentAll = $"[{$"{line.LoggerLevel.Name} {channel}".TrimEnd()}] {line.LineData}\n";
File.AppendAllText(Path.Combine(logsDirectory, line.LoggerLevel.Name + ".log"), contentFile);
File.AppendAllText(Path.Combine(logsDirectory, "all.log"), contentAll);
} }
} }
} }

42
ProjectLighthouse/Logging/LoggerLevels.cs
View file

@ -1,4 +1,5 @@
using Kettu; using Kettu;
using Microsoft.Extensions.Logging;
namespace LBPUnion.ProjectLighthouse.Logging { namespace LBPUnion.ProjectLighthouse.Logging {
public class LoggerLevelStartup : LoggerLevel { public class LoggerLevelStartup : LoggerLevel {
@ -16,40 +17,11 @@ namespace LBPUnion.ProjectLighthouse.Logging {
public static readonly LoggerLevelHttp Instance = new(); public static readonly LoggerLevelHttp Instance = new();
} }
#region ASP.NET public class LoggerLevelAspNet : LoggerLevel {
public class LoggerLevelAspNetTrace : LoggerLevel { public override string Name => "AspNet";
public override string Name => "ASP.NET: Trace";
public static readonly LoggerLevelAspNetTrace Instance = new(); public LoggerLevelAspNet(LogLevel level) {
this.Channel = level.ToString();
}
} }
public class LoggerLevelAspNetDebug : LoggerLevel {
public override string Name => "ASP.NET: Debug";
public static readonly LoggerLevelAspNetDebug Instance = new();
}
public class LoggerLevelAspNetInformation : LoggerLevel {
public override string Name => "ASP.NET: Information";
public static readonly LoggerLevelAspNetInformation Instance = new();
}
public class LoggerLevelAspNetWarning : LoggerLevel {
public override string Name => "ASP.NET: Warning";
public static readonly LoggerLevelAspNetWarning Instance = new();
}
public class LoggerLevelAspNetError : LoggerLevel {
public override string Name => "ASP.NET: Error";
public static readonly LoggerLevelAspNetError Instance = new();
}
public class LoggerLevelAspNetCritical : LoggerLevel {
public override string Name => "ASP.NET: Critical";
public static readonly LoggerLevelAspNetCritical Instance = new();
}
public class LoggerLevelAspNetNone : LoggerLevel {
public override string Name => "ASP.NET: None";
public static readonly LoggerLevelAspNetNone Instance = new();
}
#endregion
} }

6
ProjectLighthouse/ProjectLighthouse.csproj
View file

@ -9,7 +9,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="BCrypt.Net-Next" Version="4.0.2" /> <PackageReference Include="BCrypt.Net-Next" Version="4.0.2" />
<PackageReference Include="Kettu" Version="1.0.2" /> <PackageReference Include="Kettu" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.11" /> <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.11" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.11"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.11">
@ -23,4 +23,8 @@
<Compile Remove="Types\SlotXsd.cs" /> <Compile Remove="Types\SlotXsd.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="logs" />
</ItemGroup>
</Project> </Project>