Implement submodule changes. Handle task cancellation in CpuUtilizati…

…onSampler.
immense · Jun 1, 2023 · 382a9a6 · 382a9a6
1 parent 4f9f3cb
commit 382a9a6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/Agent/Services/CpuUtilizationSampler.cs b/Agent/Services/CpuUtilizationSampler.cs
@@ -39,12 +39,16 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
             {
                 var currentUtil = await GetCpuUtilization(stoppingToken);
                 Interlocked.Exchange(ref _currentUtilization, currentUtil);
+                await Task.Delay(TimeSpan.FromSeconds(5), stoppingToken);
+            }
+            catch (TaskCanceledException)
+            {
+                _logger.LogInformation("Task canceled while taking CPU utilization sample.  Application may be shutting down.");
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex, "Error while getting CPU utilization sample.");
             }
-            await Task.Delay(TimeSpan.FromSeconds(5), stoppingToken);
         }
     }
 

diff --git a/Server/Services/RcImplementations/HubEventHandler.cs b/Server/Services/RcImplementations/HubEventHandler.cs
@@ -62,6 +62,16 @@ public Task InvokeCtrlAltDel(RemoteControlSession session, string viewerConnecti
             return _serviceHub.Clients.Client(ex.AgentConnectionId).SendAsync("CtrlAltDel");
         }
 
+        public Task NotifyRemoteControlEnded(RemoteControlSession sessionInfo)
+        {
+            return Task.CompletedTask;
+        }
+
+        public Task NotifyRemoteControlStarted(RemoteControlSession sessionInfo)
+        {
+            return Task.CompletedTask;
+        }
+
         public Task NotifySessionChanged(RemoteControlSession session, SessionSwitchReasonEx reason, int currentSessionId)
         {
             if (session is not RemoteControlSessionEx ex)

diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl