Skip to content

Use different logger categories for client and server in McpJsonRpcEndpoint #110

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
stephentoub merged 2 commits into from
Mar 27, 2025
Merged

Use different logger categories for client and server in McpJsonRpcEndpoint #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0bb8e3
Use different logger categories for client and server in McpJsonRpcEn…
halter73 Mar 26, 2025
3ceaf16
Address PR feedback
halter73 Mar 27, 2025
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
2 changes: 0 additions & 2 deletions src/ModelContextProtocol/Client/McpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace ModelContextProtocol.Client;
internal sealed class McpClient : McpJsonRpcEndpoint, IMcpClient
{
private readonly McpClientOptions _options;
private readonly ILogger _logger;
private readonly IClientTransport _clientTransport;

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

EndpointName = $"Client ({serverConfig.Id}: {serverConfig.Name})";
Expand Down
2 changes: 0 additions & 2 deletions src/ModelContextProtocol/Server/McpServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ namespace ModelContextProtocol.Server;
internal sealed class McpServer : McpJsonRpcEndpoint, IMcpServer
{
private readonly IServerTransport? _serverTransport;
private readonly ILogger _logger;
private readonly string _serverDescription;
private volatile bool _isInitializing;

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

_serverTransport = transport as IServerTransport;
_logger = (ILogger?)loggerFactory?.CreateLogger<McpServer>() ?? NullLogger.Instance;
ServerInstructions = options.ServerInstructions;
Services = serviceProvider;
_serverDescription = $"{options.ServerInfo.Name} {options.ServerInfo.Version}";
Expand Down
7 changes: 3 additions & 4 deletions src/ModelContextProtocol/Shared/McpJsonRpcEndpoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ internal abstract class McpJsonRpcEndpoint : IAsyncDisposable
private readonly Dictionary<string, Func<JsonRpcRequest, CancellationToken, Task<object?>>> _requestHandlers = [];
private int _nextRequestId;
private readonly JsonSerializerOptions _jsonOptions;
private readonly ILogger _logger;
private bool _isDisposed;

protected readonly ILogger _logger;

/// <summary>
/// Initializes a new instance of the <see cref="McpJsonRpcEndpoint"/> class.
/// </summary>
Expand All @@ -40,14 +41,12 @@ protected McpJsonRpcEndpoint(ITransport transport, ILoggerFactory? loggerFactory
{
Throw.IfNull(transport);

loggerFactory ??= NullLoggerFactory.Instance;

_transport = transport;
_pendingRequests = new();
_notificationHandlers = new();
_nextRequestId = 1;
_jsonOptions = McpJsonUtilities.DefaultOptions;
_logger = (ILogger?)loggerFactory?.CreateLogger<McpClient>() ?? NullLogger.Instance;
_logger = loggerFactory?.CreateLogger(GetType()) ?? NullLogger.Instance;
}

/// <summary>
Expand Down