Skip to content

another minor fix #1342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StuartFerguson merged 2 commits into from
Oct 24, 2026
Merged

another minor fix #1342

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6771bff
another minor fix
StuartFerguson Oct 24, 2026
5d438ec
Merge branch 'main' into feature/#1337_use_modern_structured_logging
StuartFerguson Oct 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 47 additions & 60 deletions Shared.Logger/Logger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,104 +3,94 @@
using System;
using System.Diagnostics.CodeAnalysis;
using NLog;
using Shared.Logger.TennantContext;
using TennantContext;

[ExcludeFromCodeCoverage]
public static class Logger
{
public static class Logger {
private static ILogger? LoggerObject;

public static Boolean IsInitialised { get; set; }

public static void Initialise(NLog.Logger loggerObject,
String fileName)
{
String fileName) {
NlogLogger logger = new();
logger.Initialise(loggerObject, fileName);
Logger.Initialise(logger);
Initialise(logger);
}

public static void Initialise(ILogger loggerObject)
{
Logger.LoggerObject = loggerObject ?? throw new ArgumentNullException(nameof(loggerObject));
Logger.IsInitialised = true;
public static void Initialise(ILogger loggerObject) {
LoggerObject = loggerObject ?? throw new ArgumentNullException(nameof(loggerObject));
IsInitialised = true;
}

public static void LogTrace(String messageTemplate,
params Object?[] args)
{
Logger.ValidateLoggerObject();
Logger.Write(logger => logger.LogTrace(messageTemplate, args), true);
params Object?[] args) {
ValidateLoggerObject();
Write(logger => logger.LogTrace(messageTemplate, args), true);
Comment thread
StuartFerguson marked this conversation as resolved.
Dismissed
}

public static void LogDebug(String messageTemplate,
params Object?[] args)
{
Logger.ValidateLoggerObject();
Logger.Write(logger => logger.LogDebug(messageTemplate, args), true);
params Object?[] args) {
ValidateLoggerObject();
Write(logger => logger.LogDebug(messageTemplate, args), true);
Comment thread
StuartFerguson marked this conversation as resolved.
Dismissed
}

public static void LogInformation(String messageTemplate,
params Object?[] args)
{
Logger.ValidateLoggerObject();
Logger.Write(logger => logger.LogInformation(messageTemplate, args), true);
params Object?[] args) {
ValidateLoggerObject();
Write(logger => logger.LogInformation(messageTemplate, args), true);
Comment thread
StuartFerguson marked this conversation as resolved.
Dismissed
Comment thread
StuartFerguson marked this conversation as resolved.
Dismissed
}

public static void LogWarning(String message){
ValidateLoggerObject();
Write(logger => logger.LogWarning(message, null), true);
}

public static void LogWarning(String messageTemplate,
params Object?[] args)
{
Logger.ValidateLoggerObject();
Logger.Write(logger => logger.LogWarning(messageTemplate, args), true);
params Object?[] args) {
ValidateLoggerObject();
Write(logger => logger.LogWarning(messageTemplate, args), true);
Comment thread
StuartFerguson marked this conversation as resolved.
Dismissed
}

public static void LogError(String messageTemplate,
params Object?[] args)
{
Logger.ValidateLoggerObject();
Logger.Write(logger => logger.LogError(messageTemplate, args), true);
params Object?[] args) {
ValidateLoggerObject();
Write(logger => logger.LogError(messageTemplate, args), true);
Comment thread
StuartFerguson marked this conversation as resolved.
Dismissed
}

public static void LogError(Exception exception,
String messageTemplate,
params Object?[] args)
{
Logger.ValidateLoggerObject();
Logger.Write(logger => logger.LogError(exception, messageTemplate, args), true);
params Object?[] args) {
ValidateLoggerObject();
Write(logger => logger.LogError(exception, messageTemplate, args), true);
}

public static void LogCritical(String messageTemplate,
params Object?[] args)
{
Logger.ValidateLoggerObject();
Logger.Write(logger => logger.LogCritical(messageTemplate, args), true);
params Object?[] args) {
ValidateLoggerObject();
Write(logger => logger.LogCritical(messageTemplate, args), true);
Comment thread
StuartFerguson marked this conversation as resolved.
Dismissed
}

public static void LogCritical(Exception exception,
String messageTemplate,
params Object?[] args)
{
Logger.ValidateLoggerObject();
Logger.Write(logger => logger.LogCritical(exception, messageTemplate, args), true);
params Object?[] args) {
ValidateLoggerObject();
Write(logger => logger.LogCritical(exception, messageTemplate, args), true);
}

#pragma warning restore S1133

[MemberNotNull(nameof(LoggerObject))]
private static void ValidateLoggerObject()
{
if (Logger.LoggerObject == null)
{
private static void ValidateLoggerObject() {
if (LoggerObject == null) {
throw new InvalidOperationException("Logger has not been initialised");
}
}

private static void Write(Action<ILogger> write, Boolean isStructured=false)
{
private static void Write(Action<ILogger> write, Boolean isStructured = false) {
TenantContext tenantContext = TenantContext.CurrentTenant;
if (tenantContext == null)
{
write(Logger.LoggerObject!);
if (tenantContext == null) {
write(LoggerObject!);
return;
}

Expand All @@ -109,16 +99,13 @@
_ => $"Correlation ID: {tenantContext.CorrelationId}"
};

using (ScopeContext.PushProperty(TenantContext.KeyNameCorrelationId, correlationId))
{
write(Logger.LoggerObject!);
if (tenantContext.PerTenantLogsEnabled && tenantContext.EstateId != Guid.Empty)
{
using (ScopeContext.PushProperty("tenantId", $"_{tenantContext.EstateId}"))
{
write(Logger.LoggerObject!);
using (ScopeContext.PushProperty(TenantContext.KeyNameCorrelationId, correlationId)) {
write(LoggerObject!);
if (tenantContext.PerTenantLogsEnabled && tenantContext.EstateId != Guid.Empty) {
using (ScopeContext.PushProperty("tenantId", $"_{tenantContext.EstateId}")) {
write(LoggerObject!);
}
}
}
}
}
}
Loading