支持空命令，可发送 0x0 0x0 0x0 0x0 监测各个服务端健康性

HubCrike · Jul 31, 2020 · 9c2ba6a · 9c2ba6a
1 parent 93a9145
commit 9c2ba6a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 1 deletion.
diff --git a/JMS.Gateway.Referee/Impls/RequestReception.cs b/JMS.Gateway.Referee/Impls/RequestReception.cs
@@ -25,6 +25,11 @@ public void Interview(Socket socket)
                 using (var client = new NetClient(socket))
                 {
                     var cmd = client.ReadServiceObject<GatewayCommand>();
+                    if (cmd == null)
+                    {
+                        client.Write(Encoding.UTF8.GetBytes("ok"));
+                        return;
+                    }
                     _logger?.LogDebug("收到命令，type:{0} content:{1}", cmd.Type, cmd.Content);
 
                     _manager.AllocHandler(cmd)?.Handle(client, cmd);

diff --git a/JMS.Gateway/Impls/RequestReception.cs b/JMS.Gateway/Impls/RequestReception.cs
@@ -50,6 +50,11 @@ public void Interview(Socket socket)
                     while (true)
                     {
                         var cmd = client.ReadServiceObject<GatewayCommand>();
+                        if (cmd == null)
+                        {
+                            client.Write(Encoding.UTF8.GetBytes("ok"));
+                            return;
+                        }
                         _logger?.LogDebug("type:{0} content:{1}", cmd.Type, cmd.Content);
 
                         _manager.AllocHandler(cmd)?.Handle(client, cmd);

diff --git a/JMS.Proxy/Connect.cs b/JMS.Proxy/Connect.cs
@@ -32,6 +32,12 @@ public void Dispose()
         public void Start()
         {
             var target = _client.ReadServiceObject<NetAddress>();
+            if(target == null)
+            {
+                _client.Write(Encoding.UTF8.GetBytes("ok"));
+                _client.Dispose();
+                return;
+            }
             _logger?.LogDebug("收到转发{0} {1}", target.Address, target.Port);
 
             _targetClient = new CertClient(target, _proxy.ClientCert);

diff --git a/JMS.ServiceProvider/Impls/RequestReception.cs b/JMS.ServiceProvider/Impls/RequestReception.cs
@@ -67,6 +67,11 @@ public void Interview(Socket socket)
                     while (true)
                     {
                         var cmd = netclient.ReadServiceObject<InvokeCommand>();
+                        if (cmd == null)
+                        {
+                            netclient.Write(Encoding.UTF8.GetBytes("ok"));
+                            return;
+                        }
                         if (_processExitHandler.ProcessExited)
                             return;
 

diff --git a/JMS.ServiceProvider/JMS.ServiceProvider.csproj b/JMS.ServiceProvider/JMS.ServiceProvider.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>JMS.ServiceProvider</AssemblyName>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <RepositoryUrl>https://github.com/simpleway2016/JMS</RepositoryUrl>
-    <Version>1.0.0.20</Version>
+    <Version>1.0.0.21</Version>
     <Authors>Jack.T</Authors>
     <Company>JMS</Company>
     <Product>JMS</Product>