From 595d1021b360d77b2339ef59a12ef0d7251d97ab Mon Sep 17 00:00:00 2001 From: Samuel Lorch Date: Fri, 7 Apr 2023 21:53:51 +0200 Subject: [PATCH] ConfigManager Apply add current config argument --- internal/config/apply.go | 6 +++--- internal/config/manager.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/config/apply.go b/internal/config/apply.go index 6e49265..8b18d94 100644 --- a/internal/config/apply.go +++ b/internal/config/apply.go @@ -13,7 +13,7 @@ import ( func (m *ConfigManager) ApplyPendingChanges() error { slog.Info("Applying Pending Changes...") for _, fn := range m.applyFunctions { - err := fn(*m.pendingConfig) + err := fn(*m.currentConfig, *m.pendingConfig) if err != nil { slog.Error("Applying Pending Changes", err) err2 := revertToCurrent(m) @@ -39,7 +39,7 @@ func (m *ConfigManager) ApplyPendingChanges() error { func revertToCurrent(m *ConfigManager) error { for _, fn := range m.applyFunctions { - err := fn(*m.currentConfig) + err := fn(*m.pendingConfig, *m.currentConfig) if err != nil { return err } @@ -47,6 +47,6 @@ func revertToCurrent(m *ConfigManager) error { return nil } -func (m *ConfigManager) RegisterApplyFunction(fn func(definitions.Config) error) { +func (m *ConfigManager) RegisterApplyFunction(fn func(currentConfig definitions.Config, pendingConfig definitions.Config) error) { m.applyFunctions = append(m.applyFunctions, fn) } diff --git a/internal/config/manager.go b/internal/config/manager.go index 9b09f50..ac748dc 100644 --- a/internal/config/manager.go +++ b/internal/config/manager.go @@ -15,7 +15,7 @@ type ConfigManager struct { transactionMutex sync.Mutex - applyFunctions []func(definitions.Config) error + applyFunctions []func(currentConfig definitions.Config, pendingConfig definitions.Config) error } func CreateConfigManager() *ConfigManager {