Skip to content

Make Session.MessagesLogLevel configurable #1018

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

Open
ericvergnaud wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −10
Open

Make Session.MessagesLogLevel configurable #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 10 additions & 9 deletions QuickFIXn/Session.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ public class Session : IDisposable
private readonly SessionState _state;
private readonly IMessageFactory _msgFactory;
private readonly bool _appDoesEarlyIntercept;

private const LogLevel MessagesLogLevel = LogLevel.Information;
private readonly LogLevel _messagesLogLevel;

#region Properties

Expand Down Expand Up @@ -239,7 +238,8 @@ internal Session(
int heartBtInt,
IQuickFixLoggerFactory loggerFactory,
IMessageFactory msgFactory,
string senderDefaultApplVerId)
string senderDefaultApplVerId,
LogLevel messagesLogLevel)
{
_schedule = sessionSchedule;
_msgFactory = msgFactory;
Expand All @@ -249,13 +249,14 @@ internal Session(
SessionID = sessId;
DataDictionaryProvider = new DataDictionaryProvider(dataDictProvider);
SenderDefaultApplVerID = senderDefaultApplVerId;

SessionDataDictionary = DataDictionaryProvider.GetSessionDataDictionary(SessionID.BeginString);
ApplicationDataDictionary = SessionID.IsFIXT
? DataDictionaryProvider.GetApplicationDataDictionary(SenderDefaultApplVerID)
: SessionDataDictionary;

ILogger logger = loggerFactory.CreateSessionLogger(sessId);
_messagesLogLevel = messagesLogLevel;

_state = new SessionState(isInitiator, logger, heartBtInt, storeFactory.Create(sessId));

Expand Down Expand Up @@ -368,14 +369,14 @@ public bool Send(string message)
if (_responder is null)
return false;

if (Log.IsEnabled(MessagesLogLevel))
if (Log.IsEnabled(_messagesLogLevel))
{
using (Log.BeginScope(new Dictionary<string, object>
{
{ "MessageType", Message.GetMsgType(message) }
}))
{
Log.Log(MessagesLogLevel, LogEventIds.OutgoingMessage, "{Message}",
Log.Log(_messagesLogLevel, LogEventIds.OutgoingMessage, "{Message}",
LogAssist.RedactSensitiveFields(message, RedactFieldsInLogs, RedactionLogText));
}
}
Expand Down Expand Up @@ -542,20 +543,20 @@ private void NextMessage(string msgStr)
{
try
{
if (Log.IsEnabled(MessagesLogLevel))
if (Log.IsEnabled(_messagesLogLevel))
{
using (Log.BeginScope(new Dictionary<string, object>
{
{ "MessageType", Message.GetMsgType(msgStr) }
}))
{
Log.Log(MessagesLogLevel, LogEventIds.IncomingMessage, "{Message}",
Log.Log(_messagesLogLevel, LogEventIds.IncomingMessage, "{Message}",
LogAssist.RedactSensitiveFields(msgStr, RedactFieldsInLogs, RedactionLogText));
}
}
} catch (Exception)
{
Log.Log(MessagesLogLevel, LogEventIds.IncomingMessage, "{Message}",
Log.Log(_messagesLogLevel, LogEventIds.IncomingMessage, "{Message}",
LogAssist.RedactSensitiveFields(msgStr, RedactFieldsInLogs, RedactionLogText));
}

Expand Down
14 changes: 13 additions & 1 deletion QuickFIXn/SessionFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using Microsoft.Extensions.Logging;
using QuickFix.Logger;
using QuickFix.Store;
using QuickFix.Util;
Expand Down Expand Up @@ -99,6 +100,16 @@ public Session Create(SessionID sessionId, SettingsDictionary settings)
if(defaultApplVerId is not null)
senderDefaultApplVerId = defaultApplVerId.Value;

LogLevel messagesLogLevel = LogLevel.Information;
string? messagesLogLevelName = null;
if(settings.Has(SessionSettings.MESSAGES_LOG_LEVEL))
{
messagesLogLevelName = settings.GetString(SessionSettings.MESSAGES_LOG_LEVEL);
if (!Enum.TryParse(messagesLogLevelName, true, out LogLevel logLevel))
throw new ConfigError($"Invalid {SessionSettings.MESSAGES_LOG_LEVEL} value: {messagesLogLevelName}");
messagesLogLevel = logLevel;
}

Session session = new Session(
isInitiator,
_application,
Expand All @@ -109,7 +120,8 @@ public Session Create(SessionID sessionId, SettingsDictionary settings)
heartBtInt,
_loggerFactory,
sessionMsgFactory,
senderDefaultApplVerId);
senderDefaultApplVerId,
messagesLogLevel);

if (settings.Has("MillisecondsInTimeStamp")) {
throw new ApplicationException(
Expand Down
1 change: 1 addition & 0 deletions QuickFIXn/SessionSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public class SessionSettings
public const string SOCKET_CONNECT_PORT = "SocketConnectPort";
public const string RECONNECT_INTERVAL = "ReconnectInterval";
public const string FILE_LOG_PATH = "FileLogPath";
public const string MESSAGES_LOG_LEVEL = "MessagesLogLevel";
public const string FILE_STORE_PATH = "FileStorePath";
public const string REFRESH_ON_LOGON = "RefreshOnLogon";
public const string RESET_ON_LOGON = "ResetOnLogon";
Expand Down