vikarti.anatra/safing-portbase
1
0
Fork 0
mirror of https://github.com/safing/portbase synced 2025-09-01 10:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Increase module start/stop timeouts

Browse source
This commit is contained in:
Daniel 2020-05-29 10:52:33 +02:00
parent 07501148ea
commit 0e779b8df6
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/modules.go
View file

@ -19,6 +19,9 @@ var (
// lock modules when starting
modulesLocked = abool.New()
moduleStartTimeout = 2 * time.Minute
moduleStopTimeout = 1 * time.Minute
// ErrCleanExit is returned by Start() when the program is interrupted before starting. This can happen for example, when using the "--help" flag.
ErrCleanExit = errors.New("clean exit requested")
)
@ -117,7 +120,7 @@ func (m *Module) prep(reports chan *report) {
// execute function
err = m.runCtrlFnWithTimeout(
"prep module",
10*time.Second,
moduleStartTimeout,
m.prepFn,
)
}
@ -173,7 +176,7 @@ func (m *Module) start(reports chan *report) {
// execute function
err = m.runCtrlFnWithTimeout(
"start module",
10*time.Second,
moduleStartTimeout,
m.startFn,
)
}
@ -248,7 +251,7 @@ func (m *Module) stopAllTasks(reports chan *report) {
// wait for results
select {
case <-done:
case <-time.After(30 * time.Second):
case <-time.After(moduleStopTimeout):
log.Warningf(
"%s: timed out while waiting for stopfn/workers/tasks to finish: stopFn=%v workers=%d tasks=%d microtasks=%d, continuing shutdown...",
m.Name,