Cleanup client protocol settings.

SaladLab · Jul 13, 2016 · 1130427 · 1130427
1 parent 6404798
commit 1130427
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/TalkClient.Unity3D/Assets/Scripts/ChatScene/LoginDialog.cs b/src/TalkClient.Unity3D/Assets/Scripts/ChatScene/LoginDialog.cs
@@ -75,7 +75,7 @@ private IEnumerator ProcessLogin(string server, ChannelType type, string id, str
             var communicator = UnityCommunicatorFactory.Create();
             {
                 var channelFactory = communicator.ChannelFactory;
-                channelFactory.Type = ChannelType.Tcp;
+                channelFactory.Type = type;
                 channelFactory.ConnectEndPoint = serverEndPoint;
                 channelFactory.CreateChannelLogger = () => LogManager.GetLogger("Channel");
                 channelFactory.PacketSerializer = PacketSerializer.CreatePacketSerializer<DomainProtobufSerializer>();

diff --git a/src/TalkServer/App.config b/src/TalkServer/App.config
@@ -37,14 +37,14 @@
           name = ChatCluster
           runner {
             default = [
-              { port = 3001, roles = [ "RoomTable", "UserTable", "BotTable", [ "Room", { port = 9021 } ], [ "User", { port = 9011 } ], [ "UserLogin", { port = 9001 } ], "Bot" ] }
+              { port = 3001, roles = [ "RoomTable", "UserTable", "BotTable", "Room", "User", [ "UserLogin", { port = 9001 } ], "Bot" ] }
             ]
             cluster = [
               { port = 3001, roles = [ "RoomTable" ] }
               { port = 3002, roles = [ "UserTable" ] }
               { port = 3003, roles = [ "BotTable" ] }
-              { port = 3011, roles = [ [ "Room", { port = 9021 } ]  ] }
-              { port = 3012, roles = [ [ "Room", { port = 9022 } ]  ] }
+              { port = 3011, roles = [ [ "Room", { port = 9021 } ] ] }
+              { port = 3012, roles = [ [ "Room", { port = 9022 } ] ] }
               { port = 3021, roles = [ [ "User", { port = 9011 } ] ] }
               { port = 3022, roles = [ [ "User", { port = 9012 } ] ] }
               { port = 3031, roles = [ [ "UserLogin", { port = 9001 } ] ] }

diff --git a/src/TalkServer/ClusterRoleWorkers.cs b/src/TalkServer/ClusterRoleWorkers.cs
@@ -55,7 +55,7 @@ public class UserWorker : ClusterRoleWorker
         public UserWorker(ClusterNodeContext context, Config config)
         {
             _context = context;
-            _channelType = (ChannelType)Enum.Parse(typeof(ChannelType), config.GetString("type", "Tcp"));
+            _channelType = (ChannelType)Enum.Parse(typeof(ChannelType), config.GetString("type", "Tcp"), true);
             _listenEndPoint = new IPEndPoint(IPAddress.Any, config.GetInt("port", 0));
 
             var connectAddress = config.GetString("connect-address");
@@ -141,7 +141,7 @@ public class UserLoginWorker : ClusterRoleWorker
         public UserLoginWorker(ClusterNodeContext context, Config config)
         {
             _context = context;
-            _channelType = (ChannelType)Enum.Parse(typeof(ChannelType), config.GetString("type", "Tcp"));
+            _channelType = (ChannelType)Enum.Parse(typeof(ChannelType), config.GetString("type", "Tcp"), true);
             _listenEndPoint = new IPEndPoint(IPAddress.Any, config.GetInt("port", 0));
         }
 
@@ -221,7 +221,7 @@ public class RoomWorker : ClusterRoleWorker
         public RoomWorker(ClusterNodeContext context, Config config)
         {
             _context = context;
-            _channelType = (ChannelType)Enum.Parse(typeof(ChannelType), config.GetString("type", "Tcp"));
+            _channelType = (ChannelType)Enum.Parse(typeof(ChannelType), config.GetString("type", "Tcp"), true);
             _listenEndPoint = new IPEndPoint(IPAddress.Any, config.GetInt("port", 0));
             _connectEndPoint = new IPEndPoint(IPAddress.Parse(config.GetString("address", "127.0.0.1")), config.GetInt("port", 0));
         }
@@ -264,9 +264,12 @@ public override async Task Stop()
         {
             // stop gateway
 
-            await _gateway.CastToIActorRef().GracefulStop(
-                TimeSpan.FromSeconds(10),
-                InterfacedMessageBuilder.Request<IGateway>(x => x.Stop()));
+            if (_gateway != null)
+            {
+                await _gateway.CastToIActorRef().GracefulStop(
+                    TimeSpan.FromSeconds(10),
+                    InterfacedMessageBuilder.Request<IGateway>(x => x.Stop()));
+            }
 
             // stop room container