Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix race condition #117 #168

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Fix race condition #117 #168

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/batcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down