From 85f25c80423806cfda8cc96ebd90c5a5ace16de2 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Mon, 11 Jul 2016 22:04:50 +0900 Subject: [PATCH] Cleanup Code --- src/TalkServer/BotActor.cs | 12 ++++++------ src/TalkServer/BotPattern.cs | 18 +++++++++--------- src/TalkServer/ClusterRoleWorkers.cs | 11 ++++------- src/TalkServer/Program.cs | 6 +++--- src/TalkServer/UserActor.cs | 6 +++--- 5 files changed, 25 insertions(+), 28 deletions(-) diff --git a/src/TalkServer/BotActor.cs b/src/TalkServer/BotActor.cs index 057d7a8..48596da 100644 --- a/src/TalkServer/BotActor.cs +++ b/src/TalkServer/BotActor.cs @@ -127,32 +127,32 @@ private async Task LoginUser(string userId) [MessageHandler] private Task Handle(TimerMessage m) { - return (_pattern != null) ? _pattern.OnTimer() : Task.FromResult(true); + return (_pattern != null) ? _pattern.OnTimer() : Task.CompletedTask; } Task IUserEventObserverAsync.Invite(string invitorUserId, string roomName) { - return (_pattern != null) ? _pattern.OnInvite(invitorUserId, roomName) : Task.FromResult(true); + return (_pattern != null) ? _pattern.OnInvite(invitorUserId, roomName) : Task.CompletedTask; } Task IUserEventObserverAsync.Whisper(ChatItem chatItem) { - return (_pattern != null) ? _pattern.OnWhisper(chatItem) : Task.FromResult(true); + return (_pattern != null) ? _pattern.OnWhisper(chatItem) : Task.CompletedTask; } Task IRoomObserverAsync.Enter(string userId) { - return (_pattern != null) ? _pattern.OnEnter(userId) : Task.FromResult(true); + return (_pattern != null) ? _pattern.OnEnter(userId) : Task.CompletedTask; } Task IRoomObserverAsync.Exit(string userId) { - return (_pattern != null) ? _pattern.OnExit(userId) : Task.FromResult(true); + return (_pattern != null) ? _pattern.OnExit(userId) : Task.CompletedTask; } Task IRoomObserverAsync.Say(ChatItem chatItem) { - return (_pattern != null && chatItem.UserId != _patternContext.UserId) ? _pattern.OnSay(chatItem) : Task.FromResult(true); + return (_pattern != null && chatItem.UserId != _patternContext.UserId) ? _pattern.OnSay(chatItem) : Task.CompletedTask; } async Task IBotService.SayAsync(string message) diff --git a/src/TalkServer/BotPattern.cs b/src/TalkServer/BotPattern.cs index 2687e97..a909ac8 100644 --- a/src/TalkServer/BotPattern.cs +++ b/src/TalkServer/BotPattern.cs @@ -34,37 +34,37 @@ protected BotPattern(Context context) public virtual Task OnStart() { - return Task.FromResult(true); + return Task.CompletedTask; } public virtual Task OnTimer() { - return Task.FromResult(true); + return Task.CompletedTask; } public virtual Task OnInvite(string invitorUserId, string roomName) { - return Task.FromResult(true); + return Task.CompletedTask; } public virtual Task OnWhisper(ChatItem chatItem) { - return Task.FromResult(true); + return Task.CompletedTask; } public virtual Task OnEnter(string userId) { - return Task.FromResult(true); + return Task.CompletedTask; } public virtual Task OnExit(string userId) { - return Task.FromResult(true); + return Task.CompletedTask; } public virtual Task OnSay(ChatItem chatItem) { - return Task.FromResult(true); + return Task.CompletedTask; } protected Task SayAsync(string message) @@ -136,7 +136,7 @@ public override Task OnWhisper(ChatItem chatItem) if (chatItem.Message.ToLower() == "kill") _context.Service.Kill(); - return Task.FromResult(0); + return Task.CompletedTask; } public override async Task OnSay(ChatItem chatItem) @@ -202,7 +202,7 @@ public override Task OnWhisper(ChatItem chatItem) if (chatItem.Message.ToLower() == "kill") _context.Service.Kill(); - return Task.FromResult(0); + return Task.CompletedTask; } public override Task OnStart() diff --git a/src/TalkServer/ClusterRoleWorkers.cs b/src/TalkServer/ClusterRoleWorkers.cs index 497987a..c8696b2 100644 --- a/src/TalkServer/ClusterRoleWorkers.cs +++ b/src/TalkServer/ClusterRoleWorkers.cs @@ -31,7 +31,7 @@ public override Task Start() _userTable = _context.System.ActorOf( Props.Create(() => new DistributedActorTable("User", _context.ClusterActorDiscovery, null, null)), "UserTable"); - return Task.FromResult(true); + return Task.CompletedTask; } public override async Task Stop() @@ -175,8 +175,6 @@ public override async Task Start() public override async Task Stop() { - // stop gateway - await _gateway.CastToIActorRef().GracefulStop( TimeSpan.FromSeconds(10), InterfacedMessageBuilder.Request(x => x.Stop())); @@ -199,7 +197,7 @@ public override Task Start() _roomTable = _context.System.ActorOf( Props.Create(() => new DistributedActorTable("Room", _context.ClusterActorDiscovery, null, null)), "RoomTable"); - return Task.FromResult(true); + return Task.CompletedTask; } public override async Task Stop() @@ -250,7 +248,6 @@ public override async Task Start() ConnectEndPoint = _connectEndPoint, GatewayLogger = LogManager.GetLogger(name), TokenRequired = true, - TokenTimeout = TimeSpan.FromMinutes(1), CreateChannelLogger = (ep, _) => LogManager.GetLogger($"Channel({ep})"), ConnectionSettings = new TcpConnectionSettings { PacketSerializer = serializer }, PacketSerializer = serializer, @@ -309,7 +306,7 @@ public override Task Start() Props.Create(() => new DistributedActorTable("Bot", _context.ClusterActorDiscovery, typeof(IncrementalIntegerIdGenerator), null)), "BotTable"); - return Task.FromResult(true); + return Task.CompletedTask; } public override async Task Stop() @@ -338,7 +335,7 @@ public override Task Start() "Bot", _context.ClusterActorDiscovery, typeof(BotActorFactory), new object[] { _context }, InterfacedPoisonPill.Instance)), "BotTableContainer"); - return Task.FromResult(true); + return Task.CompletedTask; } public override async Task Stop() diff --git a/src/TalkServer/Program.cs b/src/TalkServer/Program.cs index d6d2feb..4a172a8 100644 --- a/src/TalkServer/Program.cs +++ b/src/TalkServer/Program.cs @@ -12,9 +12,9 @@ private static int Main(string[] args) string runner = null; x.AddCommandLineDefinition("runner", val => runner = val); - x.SetServiceName("TalkServer"); - x.SetDisplayName("TalkServer for Chatty"); - x.SetDescription("TalkServer for Chatty using Akka.NET and Akka.Interfaced."); + x.SetServiceName("Chatty"); + x.SetDisplayName("Chatty Service"); + x.SetDescription("Chatty Service using Akka.NET and Akka.Interfaced. (https://github.com/SaladLab/Chatty)"); x.UseAssemblyInfoForServiceInfo(); x.RunAsLocalSystem(); diff --git a/src/TalkServer/UserActor.cs b/src/TalkServer/UserActor.cs index c555417..a1e8751 100644 --- a/src/TalkServer/UserActor.cs +++ b/src/TalkServer/UserActor.cs @@ -215,19 +215,19 @@ Task IUser.CreateBot(string roomName, string botType) if (_clusterContext.BotTable != null) _clusterContext.BotTable.Create(new object[] { roomName, type }); - return Task.FromResult(0); + return Task.CompletedTask; } Task IUserMessasing.Whisper(ChatItem chatItem) { _eventObserver.Whisper(chatItem); - return Task.FromResult(0); + return Task.CompletedTask; } Task IUserMessasing.Invite(string invitorUserId, string roomName) { _eventObserver.Invite(invitorUserId, roomName); - return Task.FromResult(0); + return Task.CompletedTask; } } }