diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 0bdc5df..0c956d0 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -148,6 +148,7 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push facade + if: steps.check_facade.outputs.changed == 'true' uses: docker/build-push-action@v4 with: context: . @@ -156,6 +157,7 @@ jobs: tags: ${{ secrets.DOCKER_USERNAME }}/facade_app:latest - name: Build and push user_service + if: steps.check_user_service.outputs.changed == 'true' uses: docker/build-push-action@v4 with: context: . @@ -164,6 +166,7 @@ jobs: tags: ${{ secrets.DOCKER_USERNAME }}/user_app:latest - name: Build and push movie_service + if: steps.check_movie_service.outputs.changed == 'true' uses: docker/build-push-action@v4 with: context: . @@ -172,6 +175,7 @@ jobs: tags: ${{ secrets.DOCKER_USERNAME }}/movie_app:latest - name: Build and push payment_service + if: steps.check_payment_service.outputs.changed == 'true' uses: docker/build-push-action@v4 with: context: . @@ -180,6 +184,7 @@ jobs: tags: ${{ secrets.DOCKER_USERNAME }}/payment_app:latest - name: Build and push auth_service + if: steps.check_auth_service.outputs.changed == 'true' uses: docker/build-push-action@v4 with: context: . diff --git a/docker-compose.yml b/docker-compose.yml index e0a480a..2ce3c90 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,7 +34,7 @@ services: environment: - GF_SECURITY_ADMIN_USER=${GF_SECURITY_ADMIN_USER} - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD} - - GF_SERVER_ROOT_URL=https://cassette-world.ru/grafana + - GF_SERVER_ROOT_URL=http://cassette-world.ru/grafana - GF_SERVER_SERVE_FROM_SUB_PATH=true volumes: - grafana-data:/var/lib/grafana diff --git a/internal/middleware/middleware.go b/internal/middleware/middleware.go index 8d4d690..e532717 100644 --- a/internal/middleware/middleware.go +++ b/internal/middleware/middleware.go @@ -127,21 +127,6 @@ func logRequest(r *http.Request, start time.Time, msg string, requestID string, log.Error().Err(err).Msg("invalid-request-body") } - if isWebSocket(r) { - log.Info(). - Str("websocket", path). - Str("request-id", requestID). - Bytes("body", bodyBytes). - Str("real_ip", realIP(r)). - Int64("content_length", r.ContentLength). - Str("start_time", start.Format(time.RFC3339)). - Str("duration_human", duration.String()). - Int64("duration_ms", duration.Milliseconds()). - Msg(msg) - - return - } - log.Info(). Str("method", r.Method). Str("remote_addr", r.RemoteAddr).