From cdf9c291f8b40be6957cc269fb8dc08516e3188f Mon Sep 17 00:00:00 2001 From: seipan Date: Fri, 6 Oct 2023 00:26:29 +0900 Subject: [PATCH] fix : directory & remove docker --- Dockerfile | 26 -------------------------- Makefile | 17 ++--------------- docker-compose.yml | 10 ---------- handler.go | 6 ++++++ 4 files changed, 8 insertions(+), 51 deletions(-) delete mode 100644 Dockerfile delete mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index ff2efb5..0000000 --- a/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -## Build -FROM golang:1.20-buster AS build - -WORKDIR /go/src/github.com/seipan/mylb - -COPY go.mod ./ -COPY go.sum ./ - -RUN go mod download - -COPY . . - -RUN go build -o /docker-gs-ping - -## Deploy -FROM gcr.io/distroless/base-debian10 - -WORKDIR / - -COPY --from=build /docker-gs-ping /docker-gs-ping - -EXPOSE 8080 - -USER nonroot:nonroot - -ENTRYPOINT ["/docker-gs-ping"] \ No newline at end of file diff --git a/Makefile b/Makefile index 371b79e..8822664 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,3 @@ -DOCKER_COMPOSE_LOCAL_SERVER := docker-compose.yml .PHONY: ts-re ts-re: @@ -8,18 +7,6 @@ ts-re: ts-down: cd testserver && make down -.PHONY: up +.PHONY: run up: - docker-compose \ - -f $(DOCKER_COMPOSE_LOCAL_SERVER) up -d - - -.PHONY: down -down: - docker-compose \ - -f $(DOCKER_COMPOSE_LOCAL_SERVER) down \ - --rmi all --volumes --remove-orphans - - -.PHONY: re -re:down up \ No newline at end of file + go run . \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index b690803..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: '3' -services: - serve: - build: - context: . - dockerfile: Dockerfile - ports: - - 8080:8080 - volumes: - - ../../:/go/src/github.com/seipan/mylb \ No newline at end of file diff --git a/handler.go b/handler.go index 37318c8..4e7cc0f 100644 --- a/handler.go +++ b/handler.go @@ -4,6 +4,8 @@ import ( "net/http" "github.com/seipan/mylb/serverpool" + "github.com/seipan/mylb/utils" + "go.uber.org/zap" ) type LBHandler interface { @@ -17,6 +19,10 @@ type lbHandler struct { func (lb *lbHandler) Serve(w http.ResponseWriter, r *http.Request) { peer := lb.serverPool.GetNextValidPeer() if peer != nil { + utils.Info("access to endpoint", + zap.String("url", peer.GetURL()), + zap.Int("connections", peer.GetConnections()), + ) peer.Serve(w, r) return }