Skip to content

Commit 8be6815

Browse files
authored
Use different logger categories for client and server in McpJsonRpcEndpoint (#110)
* Use different logger categories for client and server in McpJsonRpcEndpoint * Address PR feedback
1 parent d1217c5 commit 8be6815

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

src/ModelContextProtocol/Client/McpClient.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ namespace ModelContextProtocol.Client;
1515
internal sealed class McpClient : McpJsonRpcEndpoint, IMcpClient
1616
{
1717
private readonly McpClientOptions _options;
18-
private readonly ILogger _logger;
1918
private readonly IClientTransport _clientTransport;
2019

2120
private volatile bool _isInitializing;
@@ -31,7 +30,6 @@ public McpClient(IClientTransport transport, McpClientOptions options, McpServer
3130
: base(transport, loggerFactory)
3231
{
3332
_options = options;
34-
_logger = (ILogger?)loggerFactory?.CreateLogger<McpClient>() ?? NullLogger.Instance;
3533
_clientTransport = transport;
3634

3735
EndpointName = $"Client ({serverConfig.Id}: {serverConfig.Name})";

src/ModelContextProtocol/Server/McpServer.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ namespace ModelContextProtocol.Server;
1414
internal sealed class McpServer : McpJsonRpcEndpoint, IMcpServer
1515
{
1616
private readonly IServerTransport? _serverTransport;
17-
private readonly ILogger _logger;
1817
private readonly string _serverDescription;
1918
private volatile bool _isInitializing;
2019

@@ -33,7 +32,6 @@ public McpServer(ITransport transport, McpServerOptions options, ILoggerFactory?
3332
Throw.IfNull(options);
3433

3534
_serverTransport = transport as IServerTransport;
36-
_logger = (ILogger?)loggerFactory?.CreateLogger<McpServer>() ?? NullLogger.Instance;
3735
ServerInstructions = options.ServerInstructions;
3836
Services = serviceProvider;
3937
_serverDescription = $"{options.ServerInfo.Name} {options.ServerInfo.Version}";

src/ModelContextProtocol/Shared/McpJsonRpcEndpoint.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ internal abstract class McpJsonRpcEndpoint : IAsyncDisposable
2828
private readonly Dictionary<string, Func<JsonRpcRequest, CancellationToken, Task<object?>>> _requestHandlers = [];
2929
private int _nextRequestId;
3030
private readonly JsonSerializerOptions _jsonOptions;
31-
private readonly ILogger _logger;
3231
private bool _isDisposed;
3332

33+
protected readonly ILogger _logger;
34+
3435
/// <summary>
3536
/// Initializes a new instance of the <see cref="McpJsonRpcEndpoint"/> class.
3637
/// </summary>
@@ -40,14 +41,12 @@ protected McpJsonRpcEndpoint(ITransport transport, ILoggerFactory? loggerFactory
4041
{
4142
Throw.IfNull(transport);
4243

43-
loggerFactory ??= NullLoggerFactory.Instance;
44-
4544
_transport = transport;
4645
_pendingRequests = new();
4746
_notificationHandlers = new();
4847
_nextRequestId = 1;
4948
_jsonOptions = McpJsonUtilities.DefaultOptions;
50-
_logger = (ILogger?)loggerFactory?.CreateLogger<McpClient>() ?? NullLogger.Instance;
49+
_logger = loggerFactory?.CreateLogger(GetType()) ?? NullLogger.Instance;
5150
}
5251

5352
/// <summary>

0 commit comments

Comments
 (0)