diff --git a/daemon/logger/awslogs/cloudwatchlogs.go b/daemon/logger/awslogs/cloudwatchlogs.go index 0a517f18a7..425c7b4e07 100644 --- a/daemon/logger/awslogs/cloudwatchlogs.go +++ b/daemon/logger/awslogs/cloudwatchlogs.go @@ -562,7 +562,7 @@ func (l *logStream) collectBatch(created chan bool) { ticker := newTicker(flushInterval) var eventBuffer []byte var eventBufferTimestamp int64 - var batch = newEventBatch() + batch := newEventBatch() for { select { case t := <-ticker.C: @@ -691,7 +691,6 @@ func (l *logStream) publishBatch(batch *eventBatch) { cwEvents := unwrapEvents(batch.events()) nextSequenceToken, err := l.putLogEvents(cwEvents, l.sequenceToken) - if err != nil { if apiErr := (*types.DataAlreadyAcceptedException)(nil); errors.As(err, &apiErr) { // already submitted, just grab the correct sequence token diff --git a/daemon/logger/awslogs/cloudwatchlogs_test.go b/daemon/logger/awslogs/cloudwatchlogs_test.go index b0833c1853..90bfadbb28 100644 --- a/daemon/logger/awslogs/cloudwatchlogs_test.go +++ b/daemon/logger/awslogs/cloudwatchlogs_test.go @@ -998,7 +998,7 @@ func TestCollectBatchClose(t *testing.T) { NextSequenceToken: aws.String(nextSequenceToken), }, nil } - var ticks = make(chan time.Time) + ticks := make(chan time.Time) newTicker = func(_ time.Duration) *time.Ticker { return &time.Ticker{ C: ticks, @@ -1100,7 +1100,7 @@ func TestCollectBatchLineSplit(t *testing.T) { NextSequenceToken: aws.String(nextSequenceToken), }, nil } - var ticks = make(chan time.Time) + ticks := make(chan time.Time) newTicker = func(_ time.Duration) *time.Ticker { return &time.Ticker{ C: ticks, @@ -1148,7 +1148,7 @@ func TestCollectBatchLineSplitWithBinary(t *testing.T) { NextSequenceToken: aws.String(nextSequenceToken), }, nil } - var ticks = make(chan time.Time) + ticks := make(chan time.Time) newTicker = func(_ time.Duration) *time.Ticker { return &time.Ticker{ C: ticks, @@ -1196,7 +1196,7 @@ func TestCollectBatchMaxEvents(t *testing.T) { NextSequenceToken: aws.String(nextSequenceToken), }, nil } - var ticks = make(chan time.Time) + ticks := make(chan time.Time) newTicker = func(_ time.Duration) *time.Ticker { return &time.Ticker{ C: ticks, @@ -1251,7 +1251,7 @@ func TestCollectBatchMaxTotalBytes(t *testing.T) { }, nil } - var ticks = make(chan time.Time) + ticks := make(chan time.Time) newTicker = func(_ time.Duration) *time.Ticker { return &time.Ticker{ C: ticks, @@ -1332,7 +1332,7 @@ func TestCollectBatchMaxTotalBytesWithBinary(t *testing.T) { }, nil } - var ticks = make(chan time.Time) + ticks := make(chan time.Time) newTicker = func(_ time.Duration) *time.Ticker { return &time.Ticker{ C: ticks,