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

Report module mgmt errors as module error messages

Browse source
This commit is contained in:
Daniel 2021-11-17 14:24:26 +01:00
parent c2f77b0cb4
commit 1dfba1d596
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/error.go
View file

@ -43,6 +43,7 @@ func (m *Module) NewErrorMessage(taskName string, err error) *ModuleError {
return &ModuleError{ return &ModuleError{
Message: err.Error(), Message: err.Error(),
ModuleName: m.Name, ModuleName: m.Name,
TaskName: taskName,
Severity: "error", Severity: "error",
StackTrace: string(debug.Stack()), StackTrace: string(debug.Stack()),
} }

2
modules/start.go
View file

@ -151,6 +151,7 @@ func prepareModules() error {
if rep.err == ErrCleanExit { if rep.err == ErrCleanExit {
return rep.err return rep.err
} }
rep.module.NewErrorMessage("prep module", rep.err).Report()
return fmt.Errorf("failed to prep module %s: %s", rep.module.Name, rep.err) return fmt.Errorf("failed to prep module %s: %s", rep.module.Name, rep.err)
} }
reportCnt++ reportCnt++
@ -198,6 +199,7 @@ func startModules() error {
// wait for reports // wait for reports
rep = <-reports rep = <-reports
if rep.err != nil { if rep.err != nil {
rep.module.NewErrorMessage("start module", rep.err).Report()
return fmt.Errorf("modules: could not start module %s: %s", rep.module.Name, rep.err) return fmt.Errorf("modules: could not start module %s: %s", rep.module.Name, rep.err)
} }
reportCnt++ reportCnt++

1
modules/stop.go
View file

@ -106,6 +106,7 @@ func stopModules() error {
rep = <-reports rep = <-reports
if rep.err != nil { if rep.err != nil {
lastErr = rep.err lastErr = rep.err
rep.module.NewErrorMessage("stop module", rep.err).Report()
log.Warningf("modules: could not stop module %s: %s", rep.module.Name, rep.err) log.Warningf("modules: could not stop module %s: %s", rep.module.Name, rep.err)
} }
reportCnt++ reportCnt++