particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pkg/splunk_logger: handle potentially dangling goroutine

Browse source
This commit is contained in:
Diaa Sami 2023-11-01 14:26:38 +01:00 • committed by Ondřej Budai
parent 43f43c84f6
commit 13d642bb46
3 changed files with 78 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pkg/splunk_logger/splunk_logger.go
View file

@ -2,6 +2,7 @@ package logger
import (
"bytes"
"context"
"encoding/json"
"fmt"
"net/http"
@ -40,7 +41,7 @@ type SplunkEvent struct {
Host string `json:"host"`
}
func NewSplunkLogger(url, token, source, hostname string) *SplunkLogger {
func NewSplunkLogger(context context.Context, url, token, source, hostname string) *SplunkLogger {
sl := &SplunkLogger{
client: retryablehttp.NewClient().StandardClient(),
url: url,
@ -52,15 +53,21 @@ func NewSplunkLogger(url, token, source, hostname string) *SplunkLogger {
ticker := time.NewTicker(time.Second * SendFrequency)
sl.payloads = make(chan *SplunkPayload, PayloadsChannelSize)
go sl.flushPayloads(ticker.C)
go sl.flushPayloads(context, ticker.C)
return sl
}
func (sl *SplunkLogger) flushPayloads(ticker <-chan time.Time) {
func (sl *SplunkLogger) flushPayloads(context context.Context, ticker <-chan time.Time) {
var payloads []*SplunkPayload
for {
select {
case <-context.Done():
err := sl.SendPayloads(payloads)
if err != nil {
fmt.Fprintf(os.Stderr, "Splunk logger unable to send payloads: %v", err)
}
return
case p := <-sl.payloads:
if p != nil {
payloads = append(payloads, p)