From 8094820c793bddfac46599b2ccca5bc60c2d3f62 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Mon, 17 Feb 2020 21:59:05 -0800 Subject: [PATCH] Don't uninstall agent when server might be undergoing maintenance. --- Server/Services/DeviceSocketHub.cs | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Server/Services/DeviceSocketHub.cs b/Server/Services/DeviceSocketHub.cs index 3fff288e..a39511e4 100644 --- a/Server/Services/DeviceSocketHub.cs +++ b/Server/Services/DeviceSocketHub.cs @@ -73,7 +73,7 @@ namespace Remotely.Server.Services ApiScriptResults.Set(requestID, commandID, DateTimeOffset.Now.AddHours(1)); } - public Task DeviceCameOnline(Device device) + public Task DeviceCameOnline(Device device) { try { @@ -85,8 +85,7 @@ namespace Remotely.Server.Services OrganizationID = device.OrganizationID, Message = $"Device connection for {device?.DeviceName} was denied because it is already connected." }); - Context.Abort(); - return Task.CompletedTask; + return Task.FromResult(false); } if (DataService.AddOrUpdateDevice(device, out var updatedDevice)) @@ -99,20 +98,22 @@ namespace Remotely.Server.Services .Select(x => x.Key) .ToList(); - return BrowserHub.Clients.Clients(connectionIds).SendAsync("DeviceCameOnline", Device); + BrowserHub.Clients.Clients(connectionIds).SendAsync("DeviceCameOnline", Device); + return Task.FromResult(true); + } + else + { + // Organization wasn't found. + return Task.FromResult(false); } - //else - //{ - // // Organization wasn't found. - // return Clients.Caller.SendAsync("UninstallClient"); - //} } catch (Exception ex) { DataService.WriteEvent(ex); } - return Task.CompletedTask; + Context.Abort(); + return Task.FromResult(false); } public Task DeviceHeartbeat(Device device)