From 8cddcbcb2c2b4b98996940480b6aee621cac3541 Mon Sep 17 00:00:00 2001 From: Cyberes Date: Fri, 12 Apr 2024 19:31:28 -0600 Subject: [PATCH] make request logging info level, add request logging to webserver, update service file --- loadbalancer.service | 2 +- src/proxy/handleConnect.go | 4 ++-- src/proxy/serve.go | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/loadbalancer.service b/loadbalancer.service index f726559..0b47f32 100644 --- a/loadbalancer.service +++ b/loadbalancer.service @@ -6,7 +6,7 @@ After=network.target SyslogIdentifier=proxy-loadbalancer User=loadbalancer Group=loadbalancer -ExecStart=/srv/loadbalancer/proxy-loadbalancer --config /etc/proxy-loadbalancer/config.yml +ExecStart=/srv/loadbalancer/proxy-loadbalancer -d --config /etc/proxy-loadbalancer/config.yml Restart=always [Install] diff --git a/src/proxy/handleConnect.go b/src/proxy/handleConnect.go index b83cae4..331752d 100644 --- a/src/proxy/handleConnect.go +++ b/src/proxy/handleConnect.go @@ -79,7 +79,7 @@ func (p *ForwardProxyCluster) proxyHttpConnect(w http.ResponseWriter, req *http. log.Debugf(`%s -> %s -- HTTP -- Rejecting request: "%s"`, remoteAddr, proxyHost, err) return } - defer log.Debugf(`%s -> %s -> %s -- HTTP`, remoteAddr, proxyHost, req.Host) + defer log.Infof(`%s -> %s -> %s -- HTTP`, remoteAddr, proxyHost, req.Host) parsedProxyUrl.Scheme = "http" if proxyUser != "" && proxyPass != "" { @@ -124,7 +124,7 @@ func (p *ForwardProxyCluster) proxyHttpsConnect(w http.ResponseWriter, req *http log.Debugf(`%s -> %s -- CONNECT -- Rejecting request: "%s"`, remoteAddr, proxyHost, err) return } - defer log.Debugf(`%s -> %s -> %s -- CONNECT`, remoteAddr, proxyHost, targetHost) + defer log.Infof(`%s -> %s -> %s -- CONNECT`, remoteAddr, proxyHost, targetHost) // Connect to the downstream proxy server instead of the target host proxyConn, err := net.DialTimeout("tcp", proxyHost, config.GetConfig().ProxyConnectTimeout) diff --git a/src/proxy/serve.go b/src/proxy/serve.go index a128cd2..c231798 100644 --- a/src/proxy/serve.go +++ b/src/proxy/serve.go @@ -5,6 +5,7 @@ import ( "fmt" "math" "math/rand" + "net" "net/http" "net/url" "time" @@ -24,6 +25,8 @@ func (p *ForwardProxyCluster) ServeHTTP(w http.ResponseWriter, req *http.Request // HTTP if req.URL.Scheme == "" { // When the client connects using the server as a web server. + remoteAddr, _, _ := net.SplitHostPort(req.RemoteAddr) + defer log.Infof(`%s -- %s`, remoteAddr, req.URL.Path) if req.URL.Path == "/" { rand.New(rand.NewSource(time.Now().Unix())) fmt.Fprint(w, "proxy-loadbalancer \nSee /json for status info.\n\n\n\n"+retardation[rand.Intn(len(retardation))])