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

feat: error handling #5

parent 572da8c9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
api.go
+ 2
− 8
View file @ 8b0d5f5b
...@@ -13,11 +13,8 @@ func New[C any](defaults C) *Settings[C] { ...@@ -13,11 +13,8 @@ func New[C any](defaults C) *Settings[C] {
s := &Settings[C]{} s := &Settings[C]{}
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
s.initDefaults() s.initDefaults()
...@@ -43,11 +40,8 @@ func New[C any](defaults C) *Settings[C] { ...@@ -43,11 +40,8 @@ func New[C any](defaults C) *Settings[C] {
// The mnemonic is used to identify the configuration in the configuration file // The mnemonic is used to identify the configuration in the configuration file
func (s *Settings[C]) SetMnemonic(mnemonic string) *Settings[C] { func (s *Settings[C]) SetMnemonic(mnemonic string) *Settings[C] {
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
if mnemonic == "" { if mnemonic == "" {
......
change.go
+ 1
− 4
View file @ 8b0d5f5b
...@@ -23,11 +23,8 @@ func (s *Settings[C]) setConfigInternal(config C) (*Settings[C], diff.Changelog) ...@@ -23,11 +23,8 @@ func (s *Settings[C]) setConfigInternal(config C) (*Settings[C], diff.Changelog)
err error err error
) )
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
if err := validateConfig[C](config); err != nil { if err := validateConfig[C](config); err != nil {
......
copyable.go
+ 1
− 4
View file @ 8b0d5f5b
...@@ -16,11 +16,8 @@ func (s *Settings[C]) Copy(m map[string]any) { ...@@ -16,11 +16,8 @@ func (s *Settings[C]) Copy(m map[string]any) {
s.Lock() s.Lock()
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
copyOf := func(s C) C { copyOf := func(s C) C {
......
env.go
+ 1
− 4
View file @ 8b0d5f5b
...@@ -15,11 +15,8 @@ func (s *Settings[C]) InitFromEnv(prefix string) *Settings[C] { ...@@ -15,11 +15,8 @@ func (s *Settings[C]) InitFromEnv(prefix string) *Settings[C] {
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
if prefix != "" { if prefix != "" {
......
error-handler.go
+ 1
− 0
View file @ 8b0d5f5b
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
package configuration package configuration
type ErrorEvent struct { type ErrorEvent struct {
Errors []error
} }
type ErrorHook interface { type ErrorHook interface {
......
export.go
+ 3
− 12
View file @ 8b0d5f5b
...@@ -34,11 +34,8 @@ func (s *Settings[C]) writeProperties(writer io.Writer) error { ...@@ -34,11 +34,8 @@ func (s *Settings[C]) writeProperties(writer io.Writer) error {
m, errors := getMapForProperties[C](s.config) m, errors := getMapForProperties[C](s.config)
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
if len(errors) > 0 { if len(errors) > 0 {
...@@ -61,11 +58,8 @@ func (s *Settings[C]) WriteFile(fn string, format Format) *Settings[C] { ...@@ -61,11 +58,8 @@ func (s *Settings[C]) WriteFile(fn string, format Format) *Settings[C] {
var file *os.File var file *os.File
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
if fn == "" { if fn == "" {
...@@ -89,11 +83,8 @@ func (s *Settings[C]) Write(writer io.Writer, format Format) *Settings[C] { ...@@ -89,11 +83,8 @@ func (s *Settings[C]) Write(writer io.Writer, format Format) *Settings[C] {
var err error var err error
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
switch format { switch format {
......
file.go
+ 7
− 28
View file @ 8b0d5f5b
...@@ -39,11 +39,8 @@ func (s *Settings[C]) AddFile(file string, format ...Format) *Settings[C] { ...@@ -39,11 +39,8 @@ func (s *Settings[C]) AddFile(file string, format ...Format) *Settings[C] {
var f Format var f Format
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
if format == nil || len(format) == 0 { if format == nil || len(format) == 0 {
...@@ -112,11 +109,8 @@ func (s *Settings[C]) AddDirectory(d string) *Settings[C] { ...@@ -112,11 +109,8 @@ func (s *Settings[C]) AddDirectory(d string) *Settings[C] {
func (s *Settings[C]) sanitizeDirectories() { func (s *Settings[C]) sanitizeDirectories() {
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
wd, err := os.Getwd() wd, err := os.Getwd()
...@@ -163,11 +157,8 @@ func (s *Settings[C]) AddWorkingDirectory() *Settings[C] { ...@@ -163,11 +157,8 @@ func (s *Settings[C]) AddWorkingDirectory() *Settings[C] {
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
current, err := os.Getwd() current, err := os.Getwd()
...@@ -186,11 +177,8 @@ func (s *Settings[C]) AddEtcDirectory() *Settings[C] { ...@@ -186,11 +177,8 @@ func (s *Settings[C]) AddEtcDirectory() *Settings[C] {
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
if s.mnemonic == "" { if s.mnemonic == "" {
...@@ -218,11 +206,8 @@ func (s *Settings[C]) AddUserConfigDirectory() *Settings[C] { ...@@ -218,11 +206,8 @@ func (s *Settings[C]) AddUserConfigDirectory() *Settings[C] {
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
if s.mnemonic == "" { if s.mnemonic == "" {
...@@ -253,11 +238,8 @@ func (s *Settings[C]) SetDefaultDirectories() *Settings[C] { ...@@ -253,11 +238,8 @@ func (s *Settings[C]) SetDefaultDirectories() *Settings[C] {
func (s *Settings[C]) SetFileFormat(format Format) *Settings[C] { func (s *Settings[C]) SetFileFormat(format Format) *Settings[C] {
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
if slices.Contains(availableFormats, format) { if slices.Contains(availableFormats, format) {
...@@ -272,11 +254,8 @@ func (s *Settings[C]) SetFileFormat(format Format) *Settings[C] { ...@@ -272,11 +254,8 @@ func (s *Settings[C]) SetFileFormat(format Format) *Settings[C] {
// SetFileName sets the name of the configuration file // SetFileName sets the name of the configuration file
func (s *Settings[C]) SetFileName(name string) *Settings[C] { func (s *Settings[C]) SetFileName(name string) *Settings[C] {
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
if name == "" { if name == "" {
......
flags.go
+ 8
− 14
View file @ 8b0d5f5b
...@@ -13,20 +13,17 @@ import ( ...@@ -13,20 +13,17 @@ import (
// The file is read from the flag specified by the name // The file is read from the flag specified by the name
func (s *Settings[C]) AddFileFromFlagSet(flagset *flag.FlagSet, name string, format Format) *Settings[C] { func (s *Settings[C]) AddFileFromFlagSet(flagset *flag.FlagSet, name string, format Format) *Settings[C] {
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
flag := flagset.Lookup(name) flg := flagset.Lookup(name)
if flag == nil { if flg == nil {
s.errors = append(s.errors, newFlagDoesNotExistError(name)) s.errors = append(s.errors, newFlagDoesNotExistError(name))
return s return s
} }
path := flag.Value.String() path := flg.Value.String()
if path == "" { if path == "" {
s.errors = append(s.errors, FileNameEmptyError) s.errors = append(s.errors, FileNameEmptyError)
return s return s
...@@ -40,22 +37,19 @@ func (s *Settings[C]) InitFromFlagSet(flagset *flag.FlagSet) *Settings[C] { ...@@ -40,22 +37,19 @@ func (s *Settings[C]) InitFromFlagSet(flagset *flag.FlagSet) *Settings[C] {
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
err := runOnTags(&s.config, []string{flagTagKey}, func(k string, field reflect.Value) { err := runOnTags(&s.config, []string{flagTagKey}, func(k string, field reflect.Value) {
flag := flagset.Lookup(k) flg := flagset.Lookup(k)
if flag == nil { if flg == nil {
s.errors = append(s.errors, newFlagNotFoundError(k)) s.errors = append(s.errors, newFlagNotFoundError(k))
return // flag not found return // flag not found
} }
v := flag.Value v := flg.Value
t := reflect.TypeOf(v) t := reflect.TypeOf(v)
if !field.CanSet() { if !field.CanSet() {
......
import.go
+ 3
− 12
View file @ 8b0d5f5b
...@@ -51,11 +51,8 @@ func (s *Settings[C]) importStream(r reader, f ...func(n *C)) { ...@@ -51,11 +51,8 @@ func (s *Settings[C]) importStream(r reader, f ...func(n *C)) {
var c C var c C
var err error var err error
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
err = nil // reset error err = nil // reset error
...@@ -141,11 +138,8 @@ func (s *Settings[C]) importFiles() { ...@@ -141,11 +138,8 @@ func (s *Settings[C]) importFiles() {
s.fileWatch.Unlock() s.fileWatch.Unlock()
}() }()
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
for _, d := range s.files.directories { for _, d := range s.files.directories {
...@@ -198,11 +192,8 @@ func (s *Settings[C]) Import() *Settings[C] { ...@@ -198,11 +192,8 @@ func (s *Settings[C]) Import() *Settings[C] {
s.importFiles() s.importFiles()
s.importStreams() s.importStreams()
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
if err := mergo.Merge(&s.config, defaults); err != nil { if err := mergo.Merge(&s.config, defaults); err != nil {
......
settings.go
+ 1
− 4
View file @ 8b0d5f5b
...@@ -39,11 +39,8 @@ type Settings[C any] struct { ...@@ -39,11 +39,8 @@ type Settings[C any] struct {
func (s *Settings[C]) initDefaults() *Settings[C] { func (s *Settings[C]) initDefaults() *Settings[C] {
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
err := runOnTags(&s.config, []string{"default"}, func(v string, field reflect.Value) { err := runOnTags(&s.config, []string{"default"}, func(v string, field reflect.Value) {
......
watch.go
+ 3
− 12
View file @ 8b0d5f5b
...@@ -13,11 +13,8 @@ func (s *Settings[C]) initWatch() *Settings[C] { ...@@ -13,11 +13,8 @@ func (s *Settings[C]) initWatch() *Settings[C] {
var err error var err error
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
if s.fileWatch.watcher != nil { if s.fileWatch.watcher != nil {
...@@ -40,11 +37,8 @@ func (s *Settings[C]) StopWatching() *Settings[C] { ...@@ -40,11 +37,8 @@ func (s *Settings[C]) StopWatching() *Settings[C] {
s.fileWatch.Lock() s.fileWatch.Lock()
defer s.fileWatch.Unlock() defer s.fileWatch.Unlock()
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
if s.fileWatch.watcher == nil { if s.fileWatch.watcher == nil {
...@@ -89,11 +83,8 @@ func (s *Settings[C]) Watch() *Settings[C] { ...@@ -89,11 +83,8 @@ func (s *Settings[C]) Watch() *Settings[C] {
s.fileWatch.Lock() s.fileWatch.Lock()
defer s.fileWatch.Unlock() defer s.fileWatch.Unlock()
errorCount := len(s.errors)
defer func() { defer func() {
if len(s.errors) > errorCount { s.notifyErrorHooks()
s.notifyErrorHooks()
}
}() }()
if s.fileWatch.watcher == nil { if s.fileWatch.watcher == nil {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment