Merge pull request #307 from cmu-sei/v8

V8
cmu-sei · Apr 2, 2024 · a46d12e · a46d12e
2 parents c2a7395 + 4abf67e
commit a46d12e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 18 deletions.
diff --git a/src/Ghosts.Api/Infrastructure/Services/QueueSyncService.cs b/src/Ghosts.Api/Infrastructure/Services/QueueSyncService.cs
@@ -51,8 +51,6 @@ private async void Run()
         {
             while (true)
             {
-                _log.Trace("Beginning sync loop...");
-
                 try
                 {
                     await Sync();
@@ -62,8 +60,6 @@ private async void Run()
                     _log.Error(ex);
                 }
 
-                _log.Trace("Ending sync loop");
-
                 await Task.Delay(new TimeSpan(0, 0, Program.ApplicationSettings.QueueSyncDelayInSeconds));
             }
         }
@@ -111,8 +107,6 @@ private async Task ProcessNotification(ApplicationDbContext context, Notificatio
 
             try
             {
-                _log.Trace($"Attempting find for {item}");
-
                 foreach (var webhook in webhooks)
                 {
                     var t = new Thread(() => { HandleWebhook(webhook, item); }) { IsBackground = true };
@@ -132,8 +126,6 @@ private async Task ProcessMachine(IServiceScope scope, ApplicationDbContext cont
         {
             var service = scope.ServiceProvider.GetRequiredService<IMachineService>();
 
-            _log.Trace("Scope and context created");
-
             var machines = new List<Machine>();
             var histories = new List<Machine.MachineHistoryItem>();
             var timelines = new List<HistoryTimeline>();
@@ -142,27 +134,20 @@ private async Task ProcessMachine(IServiceScope scope, ApplicationDbContext cont
 
             //clients can send up a "create webhook" payload
             var webhooks = new List<Webhook>();
-
-            _log.Trace("Beginning item processing...");
-
-            _log.Trace($"Attempting find for {item.Machine.Id}");
             Machine machine = null;
 
             if (item.Machine.Id != Guid.Empty)
                 machine = context.Machines.FirstOrDefault(o => o.Id == item.Machine.Id);
 
             if (machine == null)
             {
-                _log.Trace("Machine not found by id");
                 if (!string.IsNullOrEmpty(item.Machine.Name))
                 {
-                    _log.Trace($"Searching for machine by name {item.Machine.Name}");
                     machine = context.Machines.FirstOrDefault(o => o.Name == item.Machine.Name);
                 }
 
                 if (machine == null)
                 {
-                    _log.Trace("Machine is still null, so attempting another create");
                     if (item.Machine.Id == Guid.Empty)
                         item.Machine.Id = Guid.NewGuid();
                     item.Machine.LastReportedUtc = DateTime.UtcNow;
@@ -187,8 +172,6 @@ private async Task ProcessMachine(IServiceScope scope, ApplicationDbContext cont
                 CreatedUtc = DateTime.UtcNow
             });
 
-            _log.Trace($"Proc history type: {item.HistoryType}");
-
             if (item.HistoryType == Machine.MachineHistoryItem.HistoryType.PostedResults)
             {
                 if (item.LogDump.Log.Length > 0)

diff --git a/src/Ghosts.Api/ghosts.api.csproj b/src/Ghosts.Api/ghosts.api.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>ghosts.api</AssemblyName>
 
     <AssemblyVersion>8.0.0.0</AssemblyVersion>
-    <FileVersion>8.0.7.50</FileVersion>
+    <FileVersion>8.0.7.65</FileVersion>
 
     <Authors>GHOSTS Development Squad for CERT > Software Engineering Institute > Carnegie Mellon University</Authors>
     <Company>Carnegie Mellon University</Company>