From b7a76cc4a229c8115cf38dfcac6140e1ca0edd8b Mon Sep 17 00:00:00 2001
From: RaidMax <raidmax@live.com>
Date: Tue, 1 Feb 2022 18:31:55 -0600
Subject: [PATCH] only send heartbeat when fully initialized

---
 Application/Misc/MasterCommunication.cs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Application/Misc/MasterCommunication.cs b/Application/Misc/MasterCommunication.cs
index 74e2045b..6b356b98 100644
--- a/Application/Misc/MasterCommunication.cs
+++ b/Application/Misc/MasterCommunication.cs
@@ -26,7 +26,8 @@ namespace IW4MAdmin.Application.Misc
         private readonly ApplicationConfiguration _appConfig;
         private readonly BuildNumber _fallbackVersion = BuildNumber.Parse("99.99.99.99");
         private readonly int _apiVersion = 1;
-        private bool firstHeartBeat = true;
+        private bool _firstHeartBeat = true;
+        private static readonly TimeSpan Interval = TimeSpan.FromSeconds(30);
 
         public MasterCommunication(ILogger<MasterCommunication> logger, ApplicationConfiguration appConfig, ITranslationLookup translationLookup, IMasterApi apiInstance, IManager manager)
         {
@@ -97,7 +98,10 @@ namespace IW4MAdmin.Application.Misc
             {
                 try
                 {
-                    await UploadStatus();
+                    if (_manager.IsRunning)
+                    {
+                        await UploadStatus();
+                    }
                 }
 
                 catch (Exception ex)
@@ -107,7 +111,7 @@ namespace IW4MAdmin.Application.Misc
 
                 try
                 {
-                    await Task.Delay(30000, token);
+                    await Task.Delay(Interval, token);
                 }
 
                 catch
@@ -119,7 +123,7 @@ namespace IW4MAdmin.Application.Misc
 
         private async Task UploadStatus()
         {
-            if (firstHeartBeat)
+            if (_firstHeartBeat)
             {
                 var token = await _apiInstance.Authenticate(new AuthenticationId
                 {
@@ -153,7 +157,7 @@ namespace IW4MAdmin.Application.Misc
 
             Response<ResultMessage> response = null;
 
-            if (firstHeartBeat)
+            if (_firstHeartBeat)
             {
                 response = await _apiInstance.AddInstance(instance);
             }
@@ -161,7 +165,7 @@ namespace IW4MAdmin.Application.Misc
             else
             {
                 response = await _apiInstance.UpdateInstance(instance.Id, instance);
-                firstHeartBeat = false;
+                _firstHeartBeat = false;
             }
 
             if (response.ResponseMessage.StatusCode != System.Net.HttpStatusCode.OK)