TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-07-22 20:24:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(fileserver): being excluded

Browse source
This commit is contained in:
yusing 2025-04-26 01:45:47 +08:00
parent 4f557043a5
commit 604e2481a6
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
internal/route/route.go
View file

@ -168,24 +168,19 @@ func (r *Route) Validate() gperr.Error {
var impl routes.Route var impl routes.Route
var err gperr.Error var err gperr.Error
if r.Scheme == route.SchemeFileServer { switch r.Scheme {
r.impl, err = NewFileServer(r) case route.SchemeFileServer:
if err != nil {
errs.Add(err)
}
r.ProxyURL = gperr.Collect(errs, net.ParseURL, "file://"+r.Root) r.ProxyURL = gperr.Collect(errs, net.ParseURL, "file://"+r.Root)
r.Host = "" r.Host = ""
r.Port.Proxy = 0 r.Port.Proxy = 0
} else { case route.SchemeHTTP, route.SchemeHTTPS:
switch r.Scheme { if r.Port.Listening != 0 {
case route.SchemeHTTP, route.SchemeHTTPS: errs.Addf("unexpected listening port for %s scheme", r.Scheme)
if r.Port.Listening != 0 {
errs.Addf("unexpected listening port for %s scheme", r.Scheme)
}
case route.SchemeTCP, route.SchemeUDP:
r.LisURL = gperr.Collect(errs, net.ParseURL, fmt.Sprintf("%s://:%d", r.Scheme, r.Port.Listening))
} }
r.ProxyURL = gperr.Collect(errs, net.ParseURL, fmt.Sprintf("%s://%s:%d", r.Scheme, r.Host, r.Port.Proxy)) r.ProxyURL = gperr.Collect(errs, net.ParseURL, fmt.Sprintf("%s://%s:%d", r.Scheme, r.Host, r.Port.Proxy))
case route.SchemeTCP, route.SchemeUDP:
r.LisURL = gperr.Collect(errs, net.ParseURL, fmt.Sprintf("%s://:%d", r.Scheme, r.Port.Listening))
r.ProxyURL = gperr.Collect(errs, net.ParseURL, fmt.Sprintf("%s://%s:%d", r.Scheme, r.Host, r.Port.Proxy))
} }
if !r.UseHealthCheck() && (r.UseLoadBalance() || r.UseIdleWatcher()) { if !r.UseHealthCheck() && (r.UseLoadBalance() || r.UseIdleWatcher()) {
@ -338,7 +333,7 @@ func (r *Route) ShouldExclude() bool {
case strings.HasPrefix(r.Container.ContainerName, "buildx_"): case strings.HasPrefix(r.Container.ContainerName, "buildx_"):
return true return true
} }
} else if r.IsZeroPort() { } else if r.IsZeroPort() && r.Scheme != route.SchemeFileServer {
return true return true
} }
if strings.HasPrefix(r.Alias, "x-") || if strings.HasPrefix(r.Alias, "x-") ||