Fix race condition

JaniAnttonen#117
guifel · Nov 19, 2024 · 34aac39 · 34aac39
1 parent 57b594d
commit 34aac39
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/batcher.js b/src/batcher.js
@@ -253,15 +253,21 @@ class Batcher {
           }
         }
 
+        const savedBatchStreams = this.batch.streams
+
+        // No need to clear the batch if batching is disabled
+        logEntry === undefined && this.clearBatch()
+
         // Send the data to Grafana Loki
         req.post(this.url, this.contentType, this.options.headers, reqBody, this.options.timeout, this.options.httpAgent, this.options.httpsAgent)
           .then(() => {
-            // No need to clear the batch if batching is disabled
-            logEntry === undefined && this.clearBatch()
             this.batchSent()
             resolve()
           })
           .catch(err => {
+            // Revert batch for the logs to be sent on the next iteration
+            this.batch.streams = savedBatchStreams
+
             // Clear the batch on error if enabled
             this.options.clearOnError && this.clearBatch()