Add 5s timeout to request upload, set debug logging to a configurable

Pinkstink-Rust · Feb 23, 2021 · a3ed07a · a3ed07a
1 parent 789e23e
commit a3ed07a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/RustServerMetrics/Config/ConfigData.cs b/src/RustServerMetrics/Config/ConfigData.cs
@@ -27,5 +27,8 @@ class ConfigData
 
         [JsonProperty(PropertyName = "Server Tag")]
         public string serverTag = DEFAULT_SERVER_TAG;
+
+        [JsonProperty(PropertyName = "Debug Logging")]
+        public bool debugLogging = true;
     }
 }
diff --git a/src/RustServerMetrics/MetricsLogger.cs b/src/RustServerMetrics/MetricsLogger.cs
@@ -24,6 +24,7 @@ public class MetricsLogger : SingletonComponent<MetricsLogger>
         Message.Type _lastMessageType;
         Uri _baseUri;
 
+        public bool DebugLogging => _configuration?.debugLogging == true;
         public Uri BaseUri
         {
             get

diff --git a/src/RustServerMetrics/ReportUploader.cs b/src/RustServerMetrics/ReportUploader.cs
@@ -73,15 +73,18 @@ IEnumerator SendRequest()
             var request = new UnityWebRequest(_uri, UnityWebRequest.kHttpVerbPOST)
             {
                 uploadHandler = new UploadHandlerRaw(_data),
-                downloadHandler = new DownloadHandlerBuffer()
+                downloadHandler = new DownloadHandlerBuffer(),
+                timeout = 5,
+                useHttpContinue = true,
+                redirectLimit = 5
             };
             yield return request.SendWebRequest();
 
             if (request.isNetworkError)
             {
-                if (_attempt >= 5)
+                if (_attempt >= 2)
                 {
-                    Debug.LogError($"Error submitting metric: 5 consecutive network failures");
+                    Debug.LogError($"Error submitting metric: 2 consecutive network failures");
                     yield break;
                 }
 
@@ -93,7 +96,7 @@ IEnumerator SendRequest()
             if (request.isHttpError)
             {
                 Debug.LogError($"Error submitting metric: {request.error}");
-                Debug.LogError(request.downloadHandler.text);
+                if (_metricsLogger.DebugLogging) Debug.LogError(request.downloadHandler.text);
                 yield break;
             }
         }