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

refactored some stuff, added healthcheck support, fixed 'include file' reload not showing in log

Browse Source
This commit is contained in:
yusing
2024-10-12 13:56:38 +08:00
parent 64e30f59e8
commit d47b672aa5
41 changed files with 783 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/proxy/provider/provider.go
View File

@@ -111,7 +111,7 @@ func (p *Provider) StartAllRoutes() (res E.NestedError) {
// start watcher no matter load success or not
go p.watchEvents()
p.routes.RangeAllParallel(func(alias string, r R.Route) {
p.routes.RangeAllParallel(func(alias string, r *R.Route) {
errors.Add(r.Start().Subject(r))
})
return
@@ -126,17 +126,17 @@ func (p *Provider) StopAllRoutes() (res E.NestedError) {
errors := E.NewBuilder("errors stopping routes")
defer errors.To(&res)
p.routes.RangeAllParallel(func(alias string, r R.Route) {
p.routes.RangeAllParallel(func(alias string, r *R.Route) {
errors.Add(r.Stop().Subject(r))
})
return
}
func (p *Provider) RangeRoutes(do func(string, R.Route)) {
func (p *Provider) RangeRoutes(do func(string, *R.Route)) {
p.routes.RangeAll(do)
}
func (p *Provider) GetRoute(alias string) (R.Route, bool) {
func (p *Provider) GetRoute(alias string) (*R.Route, bool) {
return p.routes.Load(alias)
}
@@ -156,11 +156,11 @@ func (p *Provider) LoadRoutes() E.NestedError {
func (p *Provider) Statistics() ProviderStats {
numRPs := 0
numStreams := 0
p.routes.RangeAll(func(_ string, r R.Route) {
p.routes.RangeAll(func(_ string, r *R.Route) {
if !r.Started() {
return
}
switch r.Type() {
switch r.Type {
case R.RouteTypeReverseProxy:
numRPs++
case R.RouteTypeStream:
@@ -187,9 +187,17 @@ func (p *Provider) watchEvents() {
res := p.OnEvent(event, p.routes)
l.Infof("%s event %q", event.Type, event)
if res.nAdded > 0 || res.nRemoved > 0 {
l.Infof("%d route added, %d routes removed", res.nAdded, res.nRemoved)
n := res.nAdded - res.nRemoved
switch {
case n == 0:
l.Infof("%d route(s) reloaded", res.nAdded)
case n > 0:
l.Infof("%d route(s) added", n)
default:
l.Infof("%d route(s) removed", -n)
}
}
if res.err.HasError() {
if res.err != nil {
l.Error(res.err)
}
case err := <-errs: