Skip to content
Snippets Groups Projects
Verified Commit 572da8c9 authored by Volker Schukai's avatar Volker Schukai :alien:
Browse files

reduce error handler calls

parent be48805f
No related branches found
No related tags found
No related merge requests found
......@@ -188,13 +188,6 @@ func (s *Settings[C]) Import() *Settings[C] {
s.Lock()
errorCount := len(s.errors)
defer func() {
if len(s.errors) > errorCount {
s.notifyErrorHooks()
}
}()
defaults := s.config
var n C
......@@ -205,6 +198,13 @@ func (s *Settings[C]) Import() *Settings[C] {
s.importFiles()
s.importStreams()
errorCount := len(s.errors)
defer func() {
if len(s.errors) > errorCount {
s.notifyErrorHooks()
}
}()
if err := mergo.Merge(&s.config, defaults); err != nil {
s.errors = append(s.errors, err)
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment