adrien/middleman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve flow

Browse Source
This commit is contained in:
Adrien PONSIN 2025-04-17 14:00:11 +02:00
parent c76d7b4d12
commit 90d442b611
No known key found for this signature in database
GPG Key ID: 7B4D4A32C05C475E
1 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
command/serve.go
View File

@ -187,11 +187,10 @@ func (ph *ProxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return return
} }
*/ */
} else { }
var ( var (
containerName string containerName string
host, _, _ = net.SplitHostPort(r.RemoteAddr) host, _, _ = net.SplitHostPort(r.RemoteAddr)
ip = net.ParseIP(host)
) )
for containerName, mr = range containerMethodRegex { for containerName, mr = range containerMethodRegex {
resolvedIPs, err := net.LookupIP(containerName) resolvedIPs, err := net.LookupIP(containerName)
@ -200,7 +199,7 @@ func (ph *ProxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
continue continue
} }
for _, resolvedIP := range resolvedIPs { for _, resolvedIP := range resolvedIPs {
if resolvedIP.Equal(ip) { if resolvedIP.Equal(net.ParseIP(host)) {
var req *regexp.Regexp var req *regexp.Regexp
req, ok = mr[r.Method] req, ok = mr[r.Method]
if !ok { if !ok {
@ -242,7 +241,7 @@ func (ph *ProxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
} }
} }
} /*
log.Warn(). log.Warn().
Str("remote_addr", r.RemoteAddr). Str("remote_addr", r.RemoteAddr).
Str("method", r.Method). Str("method", r.Method).
@ -251,6 +250,7 @@ func (ph *ProxyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
Msg("this error may be transient due to the unavailability of one of the services") Msg("this error may be transient due to the unavailability of one of the services")
http.Error(w, http.StatusText(http.StatusServiceUnavailable), http.StatusServiceUnavailable) http.Error(w, http.StatusText(http.StatusServiceUnavailable), http.StatusServiceUnavailable)
return return
*/
} }
// checkMethodPath executes the regular expression on the path of the HTTP request if and only if // checkMethodPath executes the regular expression on the path of the HTTP request if and only if