From 572da8c96268f51ee66dd4f8e2041473f72c497e Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Tue, 15 Aug 2023 13:00:36 +0200
Subject: [PATCH] reduce error handler calls
---
import.go | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/import.go b/import.go
index f6162ef..e277c60 100644
--- a/import.go
+++ b/import.go
@@ -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)
}
--
GitLab