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

v0.5: (BREAKING) simplified config format, improved output formatting, fixed docker watcher

Browse Source
This commit is contained in:
yusing
2024-09-16 03:48:39 +08:00
parent 719693deb7
commit 5be8659a99
34 changed files with 165 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/config/config.go
View File

@@ -32,14 +32,15 @@ type Config struct {
func New() (*Config, E.NestedError) {
cfg := &Config{
l: logrus.WithField("?", "config"),
l: logrus.WithField("module", "config"),
reader: U.NewFileReader(common.ConfigPath),
watcher: W.NewFileWatcher(common.ConfigFileName),
reloadReq: make(chan struct{}),
reloadReq: make(chan struct{}, 1),
}
if err := cfg.load(); err.IsNotNil() {
return nil, err
}
cfg.startProviders()
cfg.watchChanges()
return cfg, E.Nil()
}
@@ -200,7 +201,7 @@ func (cfg *Config) load() E.NestedError {
}
}
warnings := E.NewBuilder("errors validating config")
warnings := E.NewBuilder("errors loading config")
cfg.l.Debug("starting autocert")
ap, err := autocert.NewConfig(&model.AutoCert).GetProvider()
@@ -211,7 +212,7 @@ func (cfg *Config) load() E.NestedError {
}
cfg.autocertProvider = ap
cfg.l.Debug("starting providers")
cfg.l.Debug("loading providers")
cfg.proxyProviders = F.NewMap[string, *PR.Provider]()
for _, filename := range model.Providers.Files {
p := PR.NewFileProvider(filename)
@@ -221,12 +222,7 @@ func (cfg *Config) load() E.NestedError {
p := PR.NewDockerProvider(name, dockerHost)
cfg.proxyProviders.Set(p.GetName(), p)
}
cfg.proxyProviders.EachKV(func(name string, p *PR.Provider) {
if err := p.StartAllRoutes(); err.IsNotNil() {
warnings.Add(E.Failure("start routes").Subject(p).With(err))
}
})
cfg.l.Debug("started providers")
cfg.l.Debug("loaded providers")
cfg.value = model
@@ -257,5 +253,5 @@ func (cfg *Config) startProviders() {
}
func (cfg *Config) stopProviders() {
cfg.controlProviders("stop", (*PR.Provider).StopAllRoutes)
cfg.controlProviders("stop routes", (*PR.Provider).StopAllRoutes)
}