Compare commits
5 Commits
38832fd597
...
main
Author | SHA1 | Date | |
---|---|---|---|
|
a47030f90c | ||
|
1d519ada9d | ||
|
67d59039c1 | ||
|
b32ea7cf12 | ||
bde1e0c28f |
@@ -44,7 +44,9 @@ jobs:
|
||||
--name gitea \
|
||||
https://git.netzbyte.com/api/packages/$GITEA_USER/nuget/index.json
|
||||
|
||||
dotnet nuget push ./artifacts/*.nupkg --source gitea --skip-duplicate
|
||||
# --skip-duplicate - Prevents errors if the package already exists.
|
||||
# --api-key - An random value to silence the 'No API key found' warning.
|
||||
dotnet nuget push ./artifacts/*.nupkg --source gitea --skip-duplicate --api-key SILENCE_API_KEY_WARNING
|
||||
env:
|
||||
GITEA_USER: max
|
||||
GITEA_TOKEN: ${{ secrets.PACKAGES_TOKEN }}
|
@@ -4,13 +4,13 @@ namespace DotBased.Logging.MEL;
|
||||
|
||||
public class BasedLogger : Microsoft.Extensions.Logging.ILogger
|
||||
{
|
||||
private const string _messageTemplateKey = "{OriginalFormat}";
|
||||
private const string MessageTemplateKey = "{OriginalFormat}";
|
||||
public BasedLogger(ILogger logger)
|
||||
{
|
||||
basedLogger = logger;
|
||||
_basedLogger = logger;
|
||||
}
|
||||
|
||||
private readonly ILogger basedLogger;
|
||||
private readonly ILogger _basedLogger;
|
||||
|
||||
public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
|
||||
{
|
||||
@@ -18,7 +18,7 @@ public class BasedLogger : Microsoft.Extensions.Logging.ILogger
|
||||
return;
|
||||
var severity = ConvertLogLevelToSeverity(logLevel);
|
||||
var capsule = ConstructCapsule(severity, eventId, state, exception, formatter);
|
||||
basedLogger.Log(capsule);
|
||||
_basedLogger.Log(capsule);
|
||||
}
|
||||
|
||||
private LogCapsule ConstructCapsule<TState>(LogSeverity severity, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
|
||||
@@ -29,7 +29,7 @@ public class BasedLogger : Microsoft.Extensions.Logging.ILogger
|
||||
{
|
||||
foreach (var prop in stateEnum)
|
||||
{
|
||||
if (prop is { Key: _messageTemplateKey, Value: string propValueString })
|
||||
if (prop is { Key: MessageTemplateKey, Value: string propValueString })
|
||||
{
|
||||
msgTemplate = propValueString;
|
||||
continue;
|
||||
@@ -38,15 +38,7 @@ public class BasedLogger : Microsoft.Extensions.Logging.ILogger
|
||||
}
|
||||
}
|
||||
|
||||
return new LogCapsule()
|
||||
{
|
||||
Exception = exception,
|
||||
Message = msgTemplate,
|
||||
Parameters = templateParams.ToArray(),
|
||||
Severity = severity,
|
||||
TimeStamp = DateTime.Now,
|
||||
Logger = basedLogger as LoggerBase ?? throw new NullReferenceException(nameof(basedLogger))
|
||||
};
|
||||
return new LogCapsule(_basedLogger as LoggerBase ?? throw new NullReferenceException(nameof(_basedLogger)), severity, msgTemplate, exception, templateParams.ToArray(), DateTime.Now);
|
||||
}
|
||||
|
||||
private LogSeverity ConvertLogLevelToSeverity(LogLevel level)
|
||||
@@ -66,5 +58,5 @@ public class BasedLogger : Microsoft.Extensions.Logging.ILogger
|
||||
|
||||
public bool IsEnabled(LogLevel logLevel) => logLevel != LogLevel.None;
|
||||
|
||||
public IDisposable? BeginScope<TState>(TState state) where TState : notnull => default;
|
||||
public IDisposable? BeginScope<TState>(TState state) where TState : notnull => null;
|
||||
}
|
@@ -1,10 +1,13 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.1</TargetFramework>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<LangVersion>12</LangVersion>
|
||||
<Authors>NetzByte</Authors>
|
||||
<PackageProjectUrl>https://git.netzbyte.com/max/DotBased</PackageProjectUrl>
|
||||
<RepositoryUrl>https://git.netzbyte.com/max/DotBased</RepositoryUrl>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@@ -1,9 +1,12 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.1</TargetFramework>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<LangVersion>default</LangVersion>
|
||||
<Authors>NetzByte</Authors>
|
||||
<PackageProjectUrl>https://git.netzbyte.com/max/DotBased</PackageProjectUrl>
|
||||
<RepositoryUrl>https://git.netzbyte.com/max/DotBased</RepositoryUrl>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
BIN
DotBased/DotBased-ICO.png
Normal file
BIN
DotBased/DotBased-ICO.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 73 KiB |
@@ -4,7 +4,18 @@
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<LangVersion>default</LangVersion>
|
||||
<TargetFramework>netstandard2.1</TargetFramework>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<Authors>NetzByte</Authors>
|
||||
<PackageIcon>DotBased-ICO.png</PackageIcon>
|
||||
<PackageProjectUrl>https://git.netzbyte.com/max/DotBased</PackageProjectUrl>
|
||||
<RepositoryUrl>https://git.netzbyte.com/max/DotBased</RepositoryUrl>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Update="DotBased-ICO.png">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath></PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
@@ -3,21 +3,4 @@ namespace DotBased.Logging;
|
||||
/// <summary>
|
||||
/// This will contain all the log event information that the log adapter will receive.
|
||||
/// </summary>
|
||||
public class LogCapsule
|
||||
{
|
||||
/// <summary>
|
||||
/// The log serverty this log event is being logged.
|
||||
/// </summary>
|
||||
public LogSeverity Severity { get; set; }
|
||||
public string Message { get; set; } = string.Empty;
|
||||
public Exception? Exception { get; set; }
|
||||
public object?[]? Parameters { get; set; }
|
||||
/// <summary>
|
||||
/// Time stamp on when this event happend
|
||||
/// </summary>
|
||||
public DateTime TimeStamp { get; set; }
|
||||
/// <summary>
|
||||
/// The logger that generated this capsule
|
||||
/// </summary>
|
||||
public LoggerBase Logger { get; set; }
|
||||
}
|
||||
public record LogCapsule(LoggerBase Logger, LogSeverity Severity, string Message, Exception? Exception, object?[]? Parameters, DateTime TimeStamp);
|
@@ -7,88 +7,37 @@ public class Logger(LoggerInformation loggerInformation, string name) : LoggerBa
|
||||
{
|
||||
public override void Verbose(string message, params object?[]? parameters)
|
||||
{
|
||||
Log(new LogCapsule()
|
||||
{
|
||||
Logger = this,
|
||||
Message = message,
|
||||
Parameters = parameters,
|
||||
Severity = LogSeverity.Verbose,
|
||||
TimeStamp = DateTime.Now
|
||||
});
|
||||
Log(new LogCapsule(this, LogSeverity.Verbose, message, null, parameters, DateTime.Now));
|
||||
}
|
||||
|
||||
public override void Trace(string message, params object?[]? parameters)
|
||||
{
|
||||
Log(new LogCapsule()
|
||||
{
|
||||
Logger = this,
|
||||
Message = message,
|
||||
Parameters = parameters,
|
||||
Severity = LogSeverity.Trace,
|
||||
TimeStamp = DateTime.Now
|
||||
});
|
||||
Log(new LogCapsule(this, LogSeverity.Trace, message, null, parameters, DateTime.Now));
|
||||
}
|
||||
|
||||
public override void Debug(string message, params object?[]? parameters)
|
||||
{
|
||||
Log(new LogCapsule()
|
||||
{
|
||||
Logger = this,
|
||||
Message = message,
|
||||
Parameters = parameters,
|
||||
Severity = LogSeverity.Debug,
|
||||
TimeStamp = DateTime.Now
|
||||
});
|
||||
Log(new LogCapsule(this, LogSeverity.Debug, message, null, parameters, DateTime.Now));
|
||||
}
|
||||
|
||||
public override void Information(string message, params object?[]? parameters)
|
||||
{
|
||||
Log(new LogCapsule()
|
||||
{
|
||||
Logger = this,
|
||||
Message = message,
|
||||
Parameters = parameters,
|
||||
Severity = LogSeverity.Info,
|
||||
TimeStamp = DateTime.Now
|
||||
});
|
||||
Log(new LogCapsule(this, LogSeverity.Info, message, null, parameters, DateTime.Now));
|
||||
}
|
||||
|
||||
public override void Warning(string message, params object?[]? parameters)
|
||||
{
|
||||
Log(new LogCapsule()
|
||||
{
|
||||
Logger = this,
|
||||
Message = message,
|
||||
Parameters = parameters,
|
||||
Severity = LogSeverity.Warning,
|
||||
TimeStamp = DateTime.Now
|
||||
});
|
||||
Log(new LogCapsule(this, LogSeverity.Warning, message, null, parameters, DateTime.Now));
|
||||
}
|
||||
|
||||
public override void Error(Exception exception, string message, params object?[]? parameters)
|
||||
{
|
||||
Log(new LogCapsule()
|
||||
{
|
||||
Logger = this,
|
||||
Message = message,
|
||||
Parameters = parameters,
|
||||
Severity = LogSeverity.Error,
|
||||
TimeStamp = DateTime.Now,
|
||||
Exception = exception
|
||||
});
|
||||
Log(new LogCapsule(this, LogSeverity.Error, message, null, parameters, DateTime.Now));
|
||||
}
|
||||
|
||||
public override void Fatal(Exception exception, string message, params object?[]? parameters)
|
||||
{
|
||||
Log(new LogCapsule()
|
||||
{
|
||||
Logger = this,
|
||||
Message = message,
|
||||
Parameters = parameters,
|
||||
Severity = LogSeverity.Fatal,
|
||||
TimeStamp = DateTime.Now,
|
||||
Exception = exception
|
||||
});
|
||||
Log(new LogCapsule(this, LogSeverity.Fatal, message, null, parameters, DateTime.Now));
|
||||
}
|
||||
|
||||
public override int GetHashCode() => HashCode.Combine(LoggerInformation.TypeFullName, LoggerInformation.AssemblyFullname);
|
||||
|
Reference in New Issue
Block a user