dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix issue with closing flush signal channel (#7384)

This commit is contained in:
Steven Soroka 2020-04-21 13:33:47 -04:00 committed by GitHub
parent a4eb9c2205
commit 050ed9e61e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
agent/agent.go
View File

@ -556,6 +556,7 @@ func (a *Agent) flushLoop(
// watch for flush requests // watch for flush requests
flushRequested := make(chan os.Signal, 1) flushRequested := make(chan os.Signal, 1)
watchForFlushSignal(flushRequested) watchForFlushSignal(flushRequested)
defer stopListeningForFlushSignal(flushRequested)
// align to round interval // align to round interval
if a.Config.Agent.RoundInterval { if a.Config.Agent.RoundInterval {

3
agent/agent_notwindows.go → agent/agent_posix.go
View File

@ -12,5 +12,8 @@ const flushSignal = syscall.SIGUSR1
func watchForFlushSignal(flushRequested chan os.Signal) { func watchForFlushSignal(flushRequested chan os.Signal) {
signal.Notify(flushRequested, flushSignal) signal.Notify(flushRequested, flushSignal)
}
func stopListeningForFlushSignal(flushRequested chan os.Signal) {
defer signal.Stop(flushRequested) defer signal.Stop(flushRequested)
} }

6
agent/agent_windows.go
View File

@ -5,5 +5,9 @@ package agent
import "os" import "os"
func watchForFlushSignal(flushRequested chan os.Signal) { func watchForFlushSignal(flushRequested chan os.Signal) {
// not implemented // not supported
}
func stopListeningForFlushSignal(flushRequested chan os.Signal) {
// not supported
} }