TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-05-20 04:42:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: revert rename

Browse source
This commit is contained in:
yusing 2025-04-13 12:28:13 +08:00
parent ffea5fb3da
commit 5cdbe81beb
5 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/route/provider/docker.go
View file

@ -66,8 +66,8 @@ func (p *DockerProvider) loadRoutesImpl() (route.Routes, gperr.Error) {
return nil, gperr.Wrap(err) return nil, gperr.Wrap(err)
} }
errs := gperr.NewBuilder("") errs := gperr.NewBuilder()
routes := make(route.Routes) routes := make(route.Routes, len(containers))
for _, c := range containers { for _, c := range containers {
container := docker.FromDocker(&c, p.dockerHost) container := docker.FromDocker(&c, p.dockerHost)

17
internal/route/route.go
View file

@ -2,6 +2,7 @@ package route
import ( import (
"fmt" "fmt"
"net/url"
"strings" "strings"
"github.com/yusing/go-proxy/agent/pkg/agent" "github.com/yusing/go-proxy/agent/pkg/agent"
@ -92,11 +93,11 @@ func (r *Route) Validate() (err gperr.Error) {
r.Port.Proxy = 0 r.Port.Proxy = 0
} else { } else {
switch r.Scheme { switch r.Scheme {
case route.SchemeHTTP, route.SchemeHTTPS: case route.SchemeHTTP, route.SchemeHTTPS:
if r.Port.Listening != 0 { if r.Port.Listening != 0 {
errs.Addf("unexpected listening port for %s scheme", r.Scheme) errs.Addf("unexpected listening port for %s scheme", r.Scheme)
} }
case route.SchemeTCP, route.SchemeUDP: case route.SchemeTCP, route.SchemeUDP:
r.LisURL = gperr.Collect(errs, url.Parse, fmt.Sprintf("%s://:%d", r.Scheme, r.Port.Listening)) r.LisURL = gperr.Collect(errs, url.Parse, fmt.Sprintf("%s://:%d", r.Scheme, r.Port.Listening))
} }
r.ProxyURL = gperr.Collect(errs, url.Parse, fmt.Sprintf("%s://%s:%d", r.Scheme, r.Host, r.Port.Proxy)) r.ProxyURL = gperr.Collect(errs, url.Parse, fmt.Sprintf("%s://%s:%d", r.Scheme, r.Host, r.Port.Proxy))
@ -145,8 +146,8 @@ func (r *Route) Started() bool {
} }
func (r *Route) Reference() string { func (r *Route) Reference() string {
if r.Docker != nil { if r.Container != nil {
return r.Docker.Image.Name return r.Container.Image.Name
} }
return r.Alias return r.Alias
} }
@ -378,7 +379,7 @@ func (r *Route) FinalizeHomepageConfig() {
panic("alias is empty") panic("alias is empty")
} }
isDocker := r.Container != nil isDocker := r.IsDocker()
if r.Homepage == nil { if r.Homepage == nil {
r.Homepage = &homepage.ItemConfig{Show: true} r.Homepage = &homepage.ItemConfig{Show: true}

2
internal/route/route_test.go
View file

@ -98,7 +98,7 @@ func TestRouteValidate(t *testing.T) {
Host: "example.com", Host: "example.com",
Port: route.Port{Proxy: 80}, Port: route.Port{Proxy: 80},
Metadata: Metadata{ Metadata: Metadata{
DockerContainer: &docker.Container{ Container: &docker.Container{
ContainerID: "test-id", ContainerID: "test-id",
Image: &docker.ContainerImage{ Image: &docker.ContainerImage{
Name: "test-image", Name: "test-image",

2
internal/task/debug.go
View file

@ -51,7 +51,7 @@ func toBool(v uint32) bool {
func (t *Task) callbackList() []map[string]any { func (t *Task) callbackList() []map[string]any {
list := make([]map[string]any, 0, len(t.callbacks)) list := make([]map[string]any, 0, len(t.callbacks))
for cb, _ := range t.callbacks { for cb := range t.callbacks {
list = append(list, map[string]any{ list = append(list, map[string]any{
"about": cb.about, "about": cb.about,
"wait_children": cb.waitChildren, "wait_children": cb.waitChildren,

2
internal/watcher/health/monitor/monitor.go
View file

@ -52,7 +52,7 @@ func NewMonitor(r route.Route) health.HealthMonCheck {
} }
} }
if r.IsDocker() { if r.IsDocker() {
cont := r.DockerContainer() cont := r.ContainerInfo()
client, err := docker.NewClient(cont.DockerHost) client, err := docker.NewClient(cont.DockerHost)
if err != nil { if err != nil {
return mon return mon