chore: apply various updates

engineering87 · Dec 10, 2024 · 924af08 · 924af08
1 parent a97db5a
commit 924af08
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 19 deletions.
diff --git a/src/WART-Client/WartTestClient.cs b/src/WART-Client/WartTestClient.cs
@@ -53,7 +53,7 @@ public static async Task ConnectAsync(string wartHubUrl)
             }
             catch (Exception e)
             {
-                Console.WriteLine(e);
+                Console.WriteLine(e.Message);
             }
 
             await Task.CompletedTask;

diff --git a/src/WART-Client/WartTestClientJwt.cs b/src/WART-Client/WartTestClientJwt.cs
@@ -58,7 +58,7 @@ public static async Task ConnectAsync(string wartHubUrl, string key)
             }
             catch (Exception e)
             {
-                Console.WriteLine(e);
+                Console.WriteLine(e.Message);
             }
 
             await Task.CompletedTask;

diff --git a/src/WART-Core/Controllers/WartBaseController.cs b/src/WART-Core/Controllers/WartBaseController.cs
@@ -54,21 +54,8 @@ public override void OnActionExecuted(ActionExecutedContext context)
 
                     var wartEvent = new WartEvent(request, response, httpMethod, httpPath, remoteAddress);
 
-                    // Fire-and-forget
-                    //Task.Run(() => SendToHub(wartEvent, [.. context.Filters]))
-                    //    .ContinueWith(task =>
-                    //    {
-                    //        if (task.IsFaulted)
-                    //        {
-                    //            _logger?.LogError(task.Exception, "Error sending WartEvent.");
-                    //        }
-                    //    });
-
                     _eventQueue = context.HttpContext?.RequestServices.GetService<WartEventQueueService>();
-                    if (_eventQueue != null)
-                    {
-                        _eventQueue.Enqueue(new WartEventWithFilters(wartEvent, [.. context.Filters]));
-                    }
+                    _eventQueue?.Enqueue(new WartEventWithFilters(wartEvent, [.. context.Filters]));
                 }
             }
 

diff --git a/src/WART-Core/Services/WartEventWorker.cs b/src/WART-Core/Services/WartEventWorker.cs
@@ -46,8 +46,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
             {
                 // Check if there are any connected clients.
                 if (!WartHubBase.HasConnectedClients)
-                {
-                    _logger.LogInformation("No clients connected. Pausing event processing.");
+                {                    
                     await Task.Delay(500, stoppingToken);
                     continue;
                 }
@@ -96,7 +95,7 @@ private async Task SendToHub(WartEvent wartEvent, List<IFilterMetadata> filters)
                 var groups = GetTargetGroups(filters);
 
                 // If specific groups are defined, send the event to each group in parallel.
-                if (groups.Any())
+                if (groups.Count != 0)
                 {
                     var tasks = groups.Select(group => SendEventToGroup(wartEvent, group));
                     await Task.WhenAll(tasks);