瀏覽代碼

Move Zebus to netstandard2.0

Lucas Trzesniewski 7 年之前
父節點
當前提交
18e3579027

+ 1 - 2
src/Abc.Zebus/Abc.Zebus.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -38,7 +38,6 @@
     <Reference Include="ZeroMQ">
       <HintPath>..\..\lib\zmq\ZeroMQ.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
   <ItemGroup>

+ 1 - 1
src/Abc.Zebus/Core/BusMessageLogger.cs

@@ -27,7 +27,7 @@ namespace Abc.Zebus.Core
         public BusMessageLogger(Type loggerType, string loggerFullName)
         {
             _loggerType = loggerType;
-            _logger = LogManager.GetLogger(loggerFullName);
+            _logger = LogManager.GetLogger(typeof(BusMessageLogger).Assembly, loggerFullName);
 
             // Instances of BusMessageLogger are static, no need to unsubscribe from these events
             _logger.Logger.Repository.ConfigurationChanged += (sender, args) => UpdateLogConfig();

+ 32 - 3
src/Abc.Zebus/Directory/PeerDirectoryClient.cs

@@ -62,15 +62,44 @@ namespace Abc.Zebus.Directory
 
         private void ProcessMessagesReceivedDuringRegister()
         {
-            foreach (dynamic message in _messagesReceivedDuringRegister.GetConsumingEnumerable())
+            foreach (var message in _messagesReceivedDuringRegister.GetConsumingEnumerable())
             {
                 try
                 {
-                    Handle(message);
+                    switch (message)
+                    {
+                        case PeerStarted msg:
+                            Handle(msg);
+                            break;
+
+                        case PeerStopped msg:
+                            Handle(msg);
+                            break;
+
+                        case PeerDecommissioned msg:
+                            Handle(msg);
+                            break;
+
+                        case PeerSubscriptionsUpdated msg:
+                            Handle(msg);
+                            break;
+
+                        case PeerSubscriptionsForTypesUpdated msg:
+                            Handle(msg);
+                            break;
+
+                        case PeerNotResponding msg:
+                            Handle(msg);
+                            break;
+
+                        case PeerResponding msg:
+                            Handle(msg);
+                            break;
+                    }
                 }
                 catch (Exception ex)
                 {
-                    _logger.WarnFormat("Unable to process message {0} {{{1}}}, Exception: {2}", message.GetType(), message.ToString(), ex);
+                    _logger.WarnFormat("Unable to process message {0} {{{1}}}, Exception: {2}", message.GetType(), message, ex);
                 }
             }
         }

+ 1 - 1
src/Abc.Zebus/Transport/ZmqTransport.cs

@@ -61,7 +61,7 @@ namespace Abc.Zebus.Transport
 
         internal void SetLogId(int logId)
         {
-            _logger = LogManager.GetLogger(typeof(ZmqTransport).FullName + "#" + logId);
+            _logger = LogManager.GetLogger(typeof(ZmqTransport).Assembly, typeof(ZmqTransport).FullName + "#" + logId);
         }
 
         public void Configure(PeerId peerId, string environment)