Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -299,12 +299,26 @@ func proxyConfigChanged(cfgCp *config.ConnectionPool, rp *reverseProxy) bool {
}

func applyConfig(cfg *config.Config) error {
if proxy == nil || proxyConfigChanged(&cfg.ConnectionPool, proxy) {
proxy = newReverseProxy(&cfg.ConnectionPool)
}
if err := proxy.applyConfig(cfg); err != nil {
return err
needNewProxy := proxy == nil || proxyConfigChanged(&cfg.ConnectionPool, proxy)

if needNewProxy {
newProxy := newReverseProxy(&cfg.ConnectionPool)
if err := newProxy.applyConfig(cfg); err != nil {
close(newProxy.reloadSignal)
newProxy.reloadWG.Wait()
return err
}
if proxy != nil {
close(proxy.reloadSignal)
proxy.reloadWG.Wait()
}
proxy = newProxy
} else {
if err := proxy.applyConfig(cfg); err != nil {
return err
}
}

allowedNetworksHTTP.Store(&cfg.Server.HTTP.AllowedNetworks)
allowedNetworksHTTPS.Store(&cfg.Server.HTTPS.AllowedNetworks)
allowedNetworksMetrics.Store(&cfg.Server.Metrics.AllowedNetworks)
Expand Down
2 changes: 1 addition & 1 deletion proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func newReverseProxy(cfgCp *config.ConnectionPool) *reverseProxy {
},
reloadSignal: make(chan struct{}),
reloadWG: sync.WaitGroup{},
maxIdleConns: cfgCp.MaxIdleConnsPerHost,
maxIdleConns: cfgCp.MaxIdleConns,
maxIdleConnsPerHost: cfgCp.MaxIdleConnsPerHost,
}
}
Expand Down