Skip to content

Serialize log pauses #4003

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

Closed
alexey-igrychev wants to merge 1 commit into from
+33 −0
Closed

Serialize log pauses #4003

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions util/logutil/pause.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,18 @@ import (
"github.com/sirupsen/logrus"
)

var pauseMu sync.Mutex

func Pause(l *logrus.Logger) func() {
pauseMu.Lock()
// initialize formatter with original terminal settings
l.Formatter.Format(logrus.NewEntry(l))

bw := newBufferedWriter(l.Out)
l.SetOutput(bw)
return func() {
bw.resume()
pauseMu.Unlock()
}
}

Expand Down
29 changes: 29 additions & 0 deletions util/logutil/pause_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package logutil

import (
"io"
"sync"
"testing"

"github.com/sirupsen/logrus"
)

func TestPauseConcurrent(t *testing.T) {
logger := logrus.New()
logger.SetOutput(io.Discard)

start := make(chan struct{})
var wg sync.WaitGroup
wg.Add(2)

for range 2 {
go func() {
defer wg.Done()
<-start
Pause(logger)()
}()
}

close(start)
wg.Wait()
}