From 442e0df3a6b418d13cf85dcecc73908e924cdac3 Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Mon, 1 Jun 2020 23:26:33 +0800 Subject: [PATCH] proxy: add http logging --- proxy/Dockerfile.amd64 | 6 +++--- proxy/Dockerfile.arm32v7 | 6 +++--- proxy/Dockerfile.arm64v8 | 6 +++--- proxy/Dockerfile.i386 | 6 +++--- proxy/main.go | 4 +++- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/proxy/Dockerfile.amd64 b/proxy/Dockerfile.amd64 index 3c13b08..ff8fed1 100644 --- a/proxy/Dockerfile.amd64 +++ b/proxy/Dockerfile.amd64 @@ -4,12 +4,12 @@ LABEL Lan Tian "lantian@lantian.pub" ENV GOOS=linux GOARCH=amd64 WORKDIR /root COPY . . -RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute locales busybox \ - && cd /root && go build -o /proxy \ +RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang git traceroute locales busybox \ + && cd /root && go get github.com/gorilla/handlers && go build -o /proxy \ && cd / && rm -rf /root/* \ && printf "en_US.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n" > /etc/locale.gen \ && locale-gen \ - && apt-get -qq purge -y golang \ + && apt-get -qq purge -y golang git \ && apt-get -qq autoremove --purge -y && apt-get clean && rm -rf /var/lib/apt/lists ENTRYPOINT ["/proxy"] diff --git a/proxy/Dockerfile.arm32v7 b/proxy/Dockerfile.arm32v7 index 0c8643b..1bba9a2 100644 --- a/proxy/Dockerfile.arm32v7 +++ b/proxy/Dockerfile.arm32v7 @@ -4,12 +4,12 @@ LABEL Lan Tian "lantian@lantian.pub" ENV GOOS=linux GOARCH=arm WORKDIR /root COPY . . -RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute locales busybox \ - && cd /root && go build -o /proxy \ +RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang git traceroute locales busybox \ + && cd /root && go get github.com/gorilla/handlers && go build -o /proxy \ && cd / && rm -rf /root/* \ && printf "en_US.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n" > /etc/locale.gen \ && locale-gen \ - && apt-get -qq purge -y golang \ + && apt-get -qq purge -y golang git \ && apt-get -qq autoremove --purge -y && apt-get clean && rm -rf /var/lib/apt/lists ENTRYPOINT ["/proxy"] diff --git a/proxy/Dockerfile.arm64v8 b/proxy/Dockerfile.arm64v8 index 0e46d53..9cbc33e 100644 --- a/proxy/Dockerfile.arm64v8 +++ b/proxy/Dockerfile.arm64v8 @@ -4,12 +4,12 @@ LABEL Lan Tian "lantian@lantian.pub" ENV GOOS=linux GOARCH=arm64 WORKDIR /root COPY . . -RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute locales busybox \ - && cd /root && go build -o /proxy \ +RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang git traceroute locales busybox \ + && cd /root && go get github.com/gorilla/handlers && go build -o /proxy \ && cd / && rm -rf /root/* \ && printf "en_US.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n" > /etc/locale.gen \ && locale-gen \ - && apt-get -qq purge -y golang \ + && apt-get -qq purge -y golang git \ && apt-get -qq autoremove --purge -y && apt-get clean && rm -rf /var/lib/apt/lists ENTRYPOINT ["/proxy"] diff --git a/proxy/Dockerfile.i386 b/proxy/Dockerfile.i386 index db5dc10..705ddfa 100644 --- a/proxy/Dockerfile.i386 +++ b/proxy/Dockerfile.i386 @@ -4,12 +4,12 @@ LABEL Lan Tian "lantian@lantian.pub" ENV GOOS=linux GOARCH=386 WORKDIR /root COPY . . -RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute locales busybox \ - && cd /root && go build -o /proxy \ +RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang git traceroute locales busybox \ + && cd /root && go get github.com/gorilla/handlers && go build -o /proxy \ && cd / && rm -rf /root/* \ && printf "en_US.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n" > /etc/locale.gen \ && locale-gen \ - && apt-get -qq purge -y golang \ + && apt-get -qq purge -y golang git \ && apt-get -qq autoremove --purge -y && apt-get clean && rm -rf /var/lib/apt/lists ENTRYPOINT ["/proxy"] diff --git a/proxy/main.go b/proxy/main.go index cfdb10e..c2ce83f 100644 --- a/proxy/main.go +++ b/proxy/main.go @@ -4,6 +4,8 @@ import ( "flag" "net/http" "os" + + "github.com/gorilla/handlers" ) // Check if a byte is character for number @@ -60,5 +62,5 @@ func main() { http.HandleFunc("/bird6", bird6Handler) http.HandleFunc("/traceroute", tracerouteIPv4Wrapper) http.HandleFunc("/traceroute6", tracerouteIPv6Wrapper) - http.ListenAndServe(*listenParam, nil) + http.ListenAndServe(*listenParam, handlers.LoggingHandler(os.Stdout, http.DefaultServeMux)) }