starred/godoxy-yusing
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2026-04-20 23:41:23 +02:00
Code Issues 18 Packages Projects Releases 10 Wiki Activity

refactor(config): remove unnecessary indirection

Browse Source
This commit is contained in:
yusing
2025-12-16 11:22:17 +08:00
parent de3f92246f
commit db0cbc6577
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/config/state.go
View File

@@ -93,7 +93,7 @@ func Value() *config.Config {
func (state *state) InitFromFile(filename string) error { func (state *state) InitFromFile(filename string) error {
data, err := os.ReadFile(common.ConfigPath) data, err := os.ReadFile(common.ConfigPath)
if err != nil { if err != nil {
state.Config = *config.DefaultConfig() state.Config = config.DefaultConfig()
return err return err
} }
return state.Init(data) return state.Init(data)

8
internal/config/types/config.go
View File

@@ -46,7 +46,8 @@ type (
var ActiveConfig atomic.Pointer[Config] var ActiveConfig atomic.Pointer[Config]
func init() { func init() {
ActiveConfig.Store(DefaultConfig()) cfg := DefaultConfig()
ActiveConfig.Store(&cfg)
} }
func Validate(data []byte) gperr.Error { func Validate(data []byte) gperr.Error {
@@ -54,8 +55,8 @@ func Validate(data []byte) gperr.Error {
return serialization.UnmarshalValidateYAML(data, &model) return serialization.UnmarshalValidateYAML(data, &model)
} }
func DefaultConfig() *Config { func DefaultConfig() Config {
return &Config{ return Config{
TimeoutShutdown: 3, TimeoutShutdown: 3,
Homepage: homepage.Config{ Homepage: homepage.Config{
UseDefaultCategories: true, UseDefaultCategories: true,
@@ -66,7 +67,6 @@ func DefaultConfig() *Config {
var matchDomainsRegex = regexp.MustCompile(`^[^\.]?([\w\d\-_]\.?)+[^\.]?$`) var matchDomainsRegex = regexp.MustCompile(`^[^\.]?([\w\d\-_]\.?)+[^\.]?$`)
func init() { func init() {
serialization.RegisterDefaultValueFactory(DefaultConfig)
serialization.MustRegisterValidation("domain_name", func(fl validator.FieldLevel) bool { serialization.MustRegisterValidation("domain_name", func(fl validator.FieldLevel) bool {
domains := fl.Field().Interface().([]string) domains := fl.Field().Interface().([]string)
for _, domain := range domains { for _, domain := range domains {