diff --git a/internal/config/state.go b/internal/config/state.go index 0530bf17..8af6e1dc 100644 --- a/internal/config/state.go +++ b/internal/config/state.go @@ -70,7 +70,6 @@ func SetState(state config.State) { defer stateMu.Unlock() cfg := state.Value() - config.ActiveConfig.Store(cfg) config.ActiveState.Store(state) acl.ActiveConfig.Store(cfg.ACL) entrypoint.ActiveConfig.Store(&cfg.Entrypoint) @@ -87,7 +86,7 @@ func HasState() bool { } func Value() *config.Config { - return config.ActiveConfig.Load() + return config.ActiveState.Load().Value() } func (state *state) InitFromFile(filename string) error { diff --git a/internal/config/types/config.go b/internal/config/types/config.go index a58f2a8e..c8a578f1 100644 --- a/internal/config/types/config.go +++ b/internal/config/types/config.go @@ -2,7 +2,6 @@ package config import ( "regexp" - "sync/atomic" "github.com/go-playground/validator/v10" "github.com/yusing/godoxy/agent/pkg/agent" @@ -42,14 +41,6 @@ type ( } ) -// nil-safe -var ActiveConfig atomic.Pointer[Config] - -func init() { - cfg := DefaultConfig() - ActiveConfig.Store(&cfg) -} - func Validate(data []byte) gperr.Error { var model Config return serialization.UnmarshalValidateYAML(data, &model)