diff options
Diffstat (limited to 'lib/netstd/Thrift/Server')
-rw-r--r-- | lib/netstd/Thrift/Server/TServer.cs | 8 | ||||
-rw-r--r-- | lib/netstd/Thrift/Server/TServerEventHandler.cs | 12 | ||||
-rw-r--r-- | lib/netstd/Thrift/Server/TSimpleAsyncServer.cs | 2 | ||||
-rw-r--r-- | lib/netstd/Thrift/Server/TThreadPoolAsyncServer.cs | 2 |
4 files changed, 14 insertions, 10 deletions
diff --git a/lib/netstd/Thrift/Server/TServer.cs b/lib/netstd/Thrift/Server/TServer.cs index 3fd0bc531..3d4f3fc20 100644 --- a/lib/netstd/Thrift/Server/TServer.cs +++ b/lib/netstd/Thrift/Server/TServer.cs @@ -35,7 +35,7 @@ namespace Thrift.Server protected TProtocolFactory OutputProtocolFactory; protected TTransportFactory OutputTransportFactory; - protected TServerEventHandler ServerEventHandler; + protected ITServerEventHandler ServerEventHandler; protected TServerTransport ServerTransport; protected TServer(ITProcessorFactory processorFactory, TServerTransport serverTransport, @@ -52,12 +52,12 @@ namespace Thrift.Server Logger = logger; // null is absolutely legal } - public void SetEventHandler(TServerEventHandler seh) + public void SetEventHandler(ITServerEventHandler seh) { ServerEventHandler = seh; } - public TServerEventHandler GetEventHandler() + public ITServerEventHandler GetEventHandler() { return ServerEventHandler; } @@ -66,7 +66,7 @@ namespace Thrift.Server protected void LogError( string msg) { if (Logger != null) - Logger.LogError(msg); + Logger.LogError("{Msg}",msg); // NOTE: Log message template, not string interpolation! } public abstract void Stop(); diff --git a/lib/netstd/Thrift/Server/TServerEventHandler.cs b/lib/netstd/Thrift/Server/TServerEventHandler.cs index 69314efd6..9226b42a1 100644 --- a/lib/netstd/Thrift/Server/TServerEventHandler.cs +++ b/lib/netstd/Thrift/Server/TServerEventHandler.cs @@ -25,10 +25,18 @@ namespace Thrift.Server //TODO: replacement by event? /// <summary> - /// Interface implemented by server users to handle events from the server + /// Interface implemented by server users to handle events from the server /// </summary> + /// <remarks>Replaced by ITServerEventHandler</remarks> // ReSharper disable once InconsistentNaming - public interface TServerEventHandler + #pragma warning disable IDE1006 + public interface TServerEventHandler : ITServerEventHandler { } + #pragma warning restore IDE1006 + + /// <summary> + /// Interface implemented by server users to handle events from the server + /// </summary> + public interface ITServerEventHandler { /// <summary> /// Called before the server begins */ diff --git a/lib/netstd/Thrift/Server/TSimpleAsyncServer.cs b/lib/netstd/Thrift/Server/TSimpleAsyncServer.cs index d46d58a75..f1f6277d5 100644 --- a/lib/netstd/Thrift/Server/TSimpleAsyncServer.cs +++ b/lib/netstd/Thrift/Server/TSimpleAsyncServer.cs @@ -23,8 +23,6 @@ using Thrift.Processor; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -#pragma warning disable IDE0079 // remove unnecessary pragmas -#pragma warning disable IDE0063 // using can be simplified, we don't namespace Thrift.Server { diff --git a/lib/netstd/Thrift/Server/TThreadPoolAsyncServer.cs b/lib/netstd/Thrift/Server/TThreadPoolAsyncServer.cs index ba1834cde..efa1698da 100644 --- a/lib/netstd/Thrift/Server/TThreadPoolAsyncServer.cs +++ b/lib/netstd/Thrift/Server/TThreadPoolAsyncServer.cs @@ -29,8 +29,6 @@ using Thrift.Processor; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -#pragma warning disable IDE0079 // remove unnecessary pragmas -#pragma warning disable IDE0063 // using can be simplified, we don't namespace Thrift.Server { |