Merge pull request #58 from sergelogvinov/build

add compat versions

.dockerignore

@@ -0,0 +1,9 @@
+.git/
+.github/
+.gitignore
+.dockerignore
+/charts/
+#
+docker-compose.yml
+#
+/.cargo/

.github/workflows/build-test.yaml

@@ -0,0 +1,50 @@
+name: Build check
+
+on:
+  workflow_dispatch: {}
+  pull_request:
+    branches:
+      - main
+    paths:
+      - "src/**"
+      - "Dockerfile"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Build and Test
+    timeout-minutes: 15
+    runs-on: ubuntu-24.04
+    if: github.event.pull_request.draft == false
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - name: Rust toolchain
+        uses: dtolnay/rust-toolchain@6c977a6ca4077a0ceb28ffbe03f59d46e9ac8772 # v1
+        with:
+          toolchain: "1.98"
+          components: clippy, rustfmt
+      - name: Install cargo-deny
+        uses: taiki-e/install-action@3f74d7c16a4242f1c95561e98edc25d36adb4375 # v2.87.12
+        with:
+          tool: cargo-deny
+      - name: Rust cache
+        uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
+
+      - name: Rust build
+        run: make build test
+
+      - name: Rust fmt
+        run: make fmt
+      - name: Rust linter
+        run: make lint
+      - name: Rust dependencies check
+        run: make deps

.github/workflows/release.yaml

@@ -0,0 +1,58 @@
+name: Release
+
+on:
+  workflow_dispatch: {}
+  # push:
+  #   tags:
+  #     - "v*"
+
+jobs:
+  goreleaser:
+    name: GoReleaser
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: write
+      packages: write
+      id-token: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+
+      - name: Setup Zig
+        uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2.2.1
+      - name: Rust toolchain
+        uses: dtolnay/rust-toolchain@6c977a6ca4077a0ceb28ffbe03f59d46e9ac8772 # v1
+        with:
+          toolchain: "1.98"
+          components: clippy, rustfmt
+      - name: Rust cache
+        uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
+
+      - name: Install Cosign
+        uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 # v4.1.2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@99012661954931238ded8c8b007157a8430204e1 # v4.4.0
+        with:
+          platforms: arm64
+      - name: Set up docker buildx
+        uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1
+
+      - name: Github registry login
+        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run GoReleaser
+        timeout-minutes: 60
+        uses: goreleaser/goreleaser-action@f06c13b6b1a9625abc9e6e439d9c05a8f2190e94 # v7.2.3
+        with:
+          version: "v2.18.2"
+          args: release --clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          USERNAME: ${{ github.repository_owner }}

.gitignore

@@ -21,6 +21,7 @@ com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 /target
+/.zig-cache/
 /z_shpo
 /configs
 Makefile

.goreleaser.yml

@@ -0,0 +1,126 @@
+# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
+version: 2
+project_name: aralez
+
+before:
+  hooks:
+    - cargo install --locked cargo-zigbuild
+
+dist: target
+builds:
+  - id: aralez
+    builder: rust
+    flags:
+      - --release
+    targets:
+      - x86_64-unknown-linux-gnu
+      - aarch64-unknown-linux-gnu
+    env:
+      - RUSTFLAGS={{ if eq .Arch "amd64" }}-C target-cpu=x86-64-v3 -C target-feature=+aes,+ssse3{{else}}-C target-cpu=neoverse-n1 -C target-feature=+aes,+sha2,+neon,+crc{{ end }}
+
+  - id: aralez-musl
+    builder: rust
+    flags:
+      - --release
+    targets:
+      - x86_64-unknown-linux-musl
+      - aarch64-unknown-linux-musl
+    env:
+      - RUSTFLAGS={{ if eq .Arch "amd64" }}-C target-cpu=x86-64-v3 -C target-feature=+aes,+ssse3{{else}}-C target-cpu=neoverse-n1 -C target-feature=+aes,+sha2,+neon,+crc{{ end }}
+
+  - id: aralez-compat
+    builder: rust
+    flags:
+      - --release
+    targets:
+      - x86_64-unknown-linux-gnu
+    env:
+      - RUSTFLAGS=-C target-cpu=x86-64
+
+  - id: aralez-compat-musl
+    builder: rust
+    flags:
+      - --release
+    targets:
+      - x86_64-unknown-linux-musl
+    env:
+      - RUSTFLAGS=-C target-cpu=x86-64
+
+snapshot:
+  version_template: edge
+
+archives:
+  - id: aralez
+    ids:
+      - aralez
+    formats: [binary]
+    name_template: "{{ .ProjectName }}_{{ .Arch }}-glibc"
+
+  - id: aralez-musl
+    ids:
+      - aralez-musl
+    formats: [binary]
+    name_template: "{{ .ProjectName }}_{{ .Arch }}-musl"
+
+  - id: aralez-compat
+    ids:
+      - aralez-compat
+    formats: [binary]
+    name_template: "{{ .ProjectName }}_{{ .Arch }}-compat-glibc"
+
+  - id: aralez-compat-musl
+    ids:
+      - aralez-compat-musl
+    formats: [binary]
+    name_template: "{{ .ProjectName }}_{{ .Arch }}-compat-musl"
+
+dockers_v2:
+  - id: aralez
+    ids:
+      - aralez
+    flags:
+      - --target=release
+    images:
+      - "ghcr.io/{{ .Env.USERNAME }}/{{ .ProjectName }}"
+      # - "{{ .Env.USERNAME }}/{{ .ProjectName }}"
+    tags:
+      - "{{ if not .IsSnapshot }}v{{.Version}}{{ else }}edge{{ end }}"
+    platforms:
+      - linux/amd64
+      - linux/arm64
+    annotations:
+      org.opencontainers.image.name: "{{ .ProjectName }}"
+      org.opencontainers.image.licenses: "Apache-2.0"
+      org.opencontainers.image.source: "https://github.com/{{ .Env.USERNAME }}/{{ .ProjectName }}"
+      org.opencontainers.image.url: "{{ .GitURL }}"
+      org.opencontainers.image.created: "{{ .Date }}"
+      org.opencontainers.image.version: "{{ .Version }}"
+      org.opencontainers.image.revision: "{{ .FullCommit }}"
+      io.artifacthub.package.readme-url: "https://raw.githubusercontent.com/{{ .Env.USERNAME }}/{{ .ProjectName }}/main/README.md"
+      io.artifacthub.package.license: "Apache-2.0"
+
+docker_signs:
+  - id: docker
+    ids:
+      - aralez
+    cmd: cosign
+    args:
+      - sign
+      - "--yes"
+      - "${artifact}"
+    output: true
+
+checksum:
+  name_template: checksums.txt
+  algorithm: sha256
+
+signs:
+  - artifacts: checksum
+    signature: "${artifact}.sigstore.json"
+    cmd: cosign
+    args:
+      - sign-blob
+      - "--yes"
+      - "--bundle=${signature}"
+      - "${artifact}"
+    output: true

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aralez"
-version = "0.93.4"
+version = "0.94.1"
 edition = "2021"
 license = "Apache-2.0"
 description = "Reverse proxy built on top of Cloudflare's Pingora"
@@ -16,23 +16,24 @@ strip = true
 
 [dependencies]
 tokio = { version = "1.53.1", features = ["full"] }
-pingora = { version = "0.8.1", features = ["lb", "openssl"] } # openssl, rustls, boringssl
-pingora-core = "0.8.1"
-pingora-proxy = "0.8.1"
-pingora-http = "0.8.1"
-pingora-limits = "0.8.1"
-pingora-cache = "0.8.1"
+pingora = { version = "0.9.0", features = ["lb", "openssl"] } # openssl, rustls, boringssl
+pingora-core = "0.9.0"
+pingora-proxy = "0.9.0"
+pingora-http = "0.9.0"
+pingora-limits = "0.9.0"
+pingora-cache = "0.9.0"
 dashmap = "7.0.0-rc2"
 async-trait = "0.1.92"
 log = "0.4.34"
 notify = "9.0.0-rc.4"
 axum = { version = "0.8.9" }
 serde = { version = "1.0.229", features = ["derive"] }
-noyalib = { version = "0.0.32", features = ["compat-serde-yaml"] }
+noyalib = { version = "0.0.44", features = ["compat-serde-yaml"] }
 rand = "0.10.2"
 base64 = "0.23.1"
-jsonwebtoken = { version = "11.0.0", default-features = false, features = ["use_pem", "rust_crypto"] }
-sha2 = { version = "0.11.0-rc.5", default-features = false }
+jsonwebtoken = { version = "11.1.0", default-features = false, features = ["use_pem", "rust_crypto"] }
+#sha2 = { version = "0.11.0-rc.5", default-features = false }
+sha2 = { version = "0.11.0", default-features = false }
 base16ct = { version = "1.0.0", features = ["alloc"] }
 urlencoding = "2.1.3"
 arc-swap = "1.9.2"
@@ -63,3 +64,8 @@ kube = { version = "4.2.0", features = ["runtime", "client", "derive"] }
 k8s-openapi = { version = "0.28.0", features = ["v1_32"] }
 futures = "0.3.34"
 lazy_static = "1.5.0"
+anyhow = "1.0.103"
+inventory = "0.3.24"
+elasticsearch = "9.1.0-alpha.1"
+humantime = "2.4.0"
+

Dockerfile

@@ -0,0 +1,49 @@
+# syntax = docker/dockerfile:1.22
+########################################
+
+FROM rust:1.98-trixie AS builder
+ARG TARGETARCH
+
+RUN apt-get update && \
+    apt-get install -y build-essential make cmake pkg-config libssl-dev musl-dev musl-tools
+
+RUN case "${TARGETARCH}" in \
+        amd64) \
+            apt-get install -y --no-install-recommends gcc-x86-64-linux-gnu && \
+            rustup target add x86_64-unknown-linux-gnu; \
+            rustup target add x86_64-unknown-linux-musl; \
+            ;; \
+        arm64) \
+            apt-get install -y --no-install-recommends gcc-aarch64-linux-gnu && \
+            rustup target add aarch64-unknown-linux-gnu; \
+            rustup target add aarch64-unknown-linux-musl; \
+            ;; \
+        *) echo "Unsupported architecture: ${TARGETARCH}" >&2; exit 1 ;; \
+    esac
+RUN rustup component add rustfmt clippy && \
+    cargo install cargo-deny
+
+RUN ARCH=$(case "${TARGETARCH}" in \
+        amd64) echo "x86_64" ;; \
+        arm64) echo "aarch64" ;; \
+        *) echo "${TARGETARCH}" ;; \
+    esac) && curl -LO https://ziglang.org/download/0.16.0/zig-${ARCH}-linux-0.16.0.tar.xz \
+    && tar -xf zig-${ARCH}-linux-0.16.0.tar.xz -C /opt \
+    && ln -s /opt/zig-${ARCH}-linux-0.16.0/zig /usr/local/bin/zig
+
+RUN echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list && \
+    apt-get update && apt-get install -y goreleaser
+
+RUN cargo install cargo-binstall --locked && \
+    cargo binstall cargo-zigbuild --no-confirm
+
+COPY [".", "/src"]
+
+########################################
+
+FROM --platform=${TARGETARCH} gcr.io/distroless/cc-debian13:nonroot AS release
+
+ARG TARGETPLATFORM
+COPY ${TARGETPLATFORM}/aralez /usr/local/bin/aralez
+
+ENTRYPOINT ["/usr/local/bin/aralez"]

Makefile

@@ -0,0 +1,68 @@
+########################################################
+
+USERNAME ?= aralez
+TARGET ?=  --all-targets
+FEATURES ?= --all-features
+
+########################################################
+
+.PHONY: help
+help:
+	@awk 'BEGIN {FS = ":.*?## "} /^[0-9a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
+
+########################################################
+
+.PHONY: all
+all: build test fmt checkup ## Build and test project
+
+.PHONY: build
+build: ## Build project
+	cargo build --workspace $(TARGET) $(FEATURES)
+
+.PHONY: test
+test: ## Run tests
+	cargo test --workspace $(TARGET) $(FEATURES)
+
+.PHONY: fmt
+fmt: ## Check code formatting
+	cargo fmt --all -- --check
+
+.PHONY: lint
+lint: ## Run linter
+	cargo clippy --workspace $(TARGET) $(FEATURES) -- -D warnings
+
+.PHONY: checkup
+checkup: lint ## Run linter and check project
+	cargo check --workspace $(TARGET) $(FEATURES)
+
+.PHONY: deps
+deps: ## Check project dependencies for advisories
+	cargo deny check advisories
+
+########################################################
+
+.PHONY: update
+update:
+	cargo update --verbose
+
+.PHONY: features
+features:
+	cargo features
+
+########################################################
+
+.PHONY: fix
+fix:
+	cargo fix
+
+.PHONY: fix-all
+fix-all:
+	cargo fix --all
+	cargo clippy --workspace $(TARGET) $(FEATURES) --fix
+
+########################################################
+
+.PHONY: docker-build
+docker-build: ## Build project in Docker
+	docker build --target=builder -t builder .
+	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}:/src -e USERNAME=${USERNAME} -w /src -ti builder:latest

etc/kubernetes/cert.yaml

@@ -5,5 +5,7 @@ metadata:
   namespace: aralez
 type: kubernetes.io/tls
 data:
-  tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUY3ekNDQTllZ0F3SUJBZ0lVUm12YytSU25LS01HNXVaV1JNS3NtS2dwU1drd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2dZWXhDekFKQmdOVkJBWVRBbGhZTVJJd0VBWURWUVFJREFsVGRHRjBaVTVoYldVeEVUQVBCZ05WQkFjTQpDRU5wZEhsT1lXMWxNUlF3RWdZRFZRUUtEQXREYjIxd1lXNTVUbUZ0WlRFYk1Ca0dBMVVFQ3d3U1EyOXRjR0Z1CmVWTmxZM1JwYjI1T1lXMWxNUjB3R3dZRFZRUUREQlJEYjIxdGIyNU9ZVzFsVDNKSWIzTjBibUZ0WlRBZUZ3MHkKTmpBNE1UZ3hOREkwTVRKYUZ3MHpOakE0TVRVeE5ESTBNVEphTUlHR01Rc3dDUVlEVlFRR0V3SllXREVTTUJBRwpBMVVFQ0F3SlUzUmhkR1ZPWVcxbE1SRXdEd1lEVlFRSERBaERhWFI1VG1GdFpURVVNQklHQTFVRUNnd0xRMjl0CmNHRnVlVTVoYldVeEd6QVpCZ05WQkFzTUVrTnZiWEJoYm5sVFpXTjBhVzl1VG1GdFpURWRNQnNHQTFVRUF3d1UKUTI5dGJXOXVUbUZ0WlU5eVNHOXpkRzVoYldVd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNEd0F3Z2dJSwpBb0lDQVFEQklZejBUNDRnVnZWdTBPMlA3NEV3NzE1c3FDekZuWHhTRDE4RnNCRHE2L1NadW1qYmpvTXBjWFZhCkVVQVQwMXpxRW9JZm5waHY3VExNWmtNNmZ6WTFNVGdOcXVqeHVXUGNVMTBES2VQa0Y1K1RPbWdoUUE1ODRCV1gKcmZrMlp5NXpGT012ODZUZXFCOGRyUVh2SWpHNTZhMW5DMFMwSFlnTnJ6R2srVXdrNWpDZTlaYURnc3Q5VlkrcApRYlZyUVdwR2V6RDl3WVE2bU41MkRGRERYbnp6WUVwRWVVekwwNkpNSlE5M2d5ZDVtbWd4aWlpbU1QMS9UTG5BClo2cWlYQ05UVGQvMERiL2tVWW9tK1hkTm11em83Qm1qaDY4ZzVTYUtYWkJXM25BQnhoaUVkZHoyaUViTGx2UFIKcXltcjVzazgyYlZQTWlWUC82alFLaTk0anBxVDc4ZVZZRG81dmhyMDQvczhVZk9xWVBEY0NLTGFzOEpBdTRvUwpoTnRjYm5GbGJjOG1Qcm00bnY2NlhKUUpIV1cwU1Rqc1pZWVRTRTllM3lMV2JqRlpUQTBIb3lQV1dDS1ZXSS82CnExa09IcnhJWitzOStHajB3aUJhdUpsbWk2by9oZE5qWUhsY2sxbnFTM2l6UXZ2WFpuSWtwTWkrU2pQRzhBZ0MKdEFqSWVPNlFOZVFFM3p3d3ZJb09tRnVTMC8zWkJFSkZuaWdxV0xuKzRidnV4eTNReW5JWHNsY250dDRXbjdMTAp0MWZtMTU3a2x6TUNHeHBWVXFqT1FwVnVuVnVmMDdURHdWbGxxek96TXlxZWdYSHlYODJxVlV2czdidCtpZFdOCngrdks1RUtrQUhidU9QV3lGRkJJci91aE93OWZsOEUxR1ZUYzg1OG5pM0NrWWtGeEpRSURBUUFCbzFNd1VUQWQKQmdOVkhRNEVGZ1FVQkFya1htNXZ2dDhmNVRGdkI0YmJNVS9EcEc4d0h3WURWUjBqQkJnd0ZvQVVCQXJrWG01dgp2dDhmNVRGdkI0YmJNVS9EcEc4d0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBTkJna3Foa2lHOXcwQkFRc0ZBQU9DCkFnRUFYdGJ3TVpkOElrTkxwWGFHeTRleGR6OVN0dVpjYnBhWjVWeURTdTJBdFZERm1BeXNSM0hHaEhWend5a0cKOGtibGdQQ3B3OEhWeGdMd0xmNHFuTWhvdUNHQ3ZiMVd2UjM5VW45NmVOWFA5cHFDTWhRTzFMU0JCSy80UllsUwp4ajhyRlBub3p5OHdFTzRwR1VaejN3LzJIdXgyTGovVHIxRXY5cklsa0hMZ3plazc1clpHTUIxUHhsRU1zUGNsCmtGY3NacGZ5TE5LM0FydUMzbmVGbldSODh5UHFVU3FwVEJ1OVRubjZUQ002TXVEZHlaRTZXYVlGU01zNzBJOU8KN3c5SkdreDc0UlAraTBQeUZUOFNhbUdncTUxWmtrUFZnK3ZZSUhTbGszdGlxZFN0MEYzMnVNaHNDZXZCcVUzQQp2M3lUOW9UUlpRZE9XKzQySDZjVTJ4Q2FCTVBRdnpaZWRtYno1eTNpS1NjMDBQUy8vMDI4YjIzbHpGQVZjbURHCnlOaUcraUJUVkRydHgwZC9qdGhqdzV4cllqNFBnNXl6emM2R3hkaC9VWGpUN1dqSUpweThnR3V2MHhMWVNQTDYKMmROUkYyVDl1TDQ0Z1J2K09ndTRRaHNacGg3WWxNZVp0aVpoT1IvTC8yUWdnZDMrNEhpeXBNNFpiWkUrMVg2TQoyNEtVdG5wZU53dE0wR1huU01aY2dkUm5LMWg0WDQ2T1lMYW9vSTdERkhSUWJSclJQSWl1eXZ2NXpPQzF5NTFFCm9rY0tvMVREQThRcXVHMlBRay9kMEZ0LzNiOEJoOHJCcTR1V3lKWHYyYTJJUmt1Q05MN0Myck5Rem92ekF0aW4KZnB5ejVKb1NHc1dUSVhSYlNucnpocWxFeUJCRGxQQ3AxTW1zM2xzZkFROThIQmM9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-  tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUpRUUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQ1Nzd2dna25BZ0VBQW9JQ0FRREJJWXowVDQ0Z1Z2VnUKME8yUDc0RXc3MTVzcUN6Rm5YeFNEMThGc0JEcTYvU1p1bWpiam9NcGNYVmFFVUFUMDF6cUVvSWZucGh2N1RMTQpaa002ZnpZMU1UZ05xdWp4dVdQY1UxMERLZVBrRjUrVE9tZ2hRQTU4NEJXWHJmazJaeTV6Rk9Ndjg2VGVxQjhkCnJRWHZJakc1NmExbkMwUzBIWWdOcnpHaytVd2s1akNlOVphRGdzdDlWWStwUWJWclFXcEdlekQ5d1lRNm1ONTIKREZERFhuenpZRXBFZVV6TDA2Sk1KUTkzZ3lkNW1tZ3hpaWltTVAxL1RMbkFaNnFpWENOVFRkLzBEYi9rVVlvbQorWGRObXV6bzdCbWpoNjhnNVNhS1haQlczbkFCeGhpRWRkejJpRWJMbHZQUnF5bXI1c2s4MmJWUE1pVlAvNmpRCktpOTRqcHFUNzhlVllEbzV2aHIwNC9zOFVmT3FZUERjQ0tMYXM4SkF1NG9TaE50Y2JuRmxiYzhtUHJtNG52NjYKWEpRSkhXVzBTVGpzWllZVFNFOWUzeUxXYmpGWlRBMEhveVBXV0NLVldJLzZxMWtPSHJ4SVorczkrR2owd2lCYQp1SmxtaTZvL2hkTmpZSGxjazFucVMzaXpRdnZYWm5Ja3BNaStTalBHOEFnQ3RBakllTzZRTmVRRTN6d3d2SW9PCm1GdVMwLzNaQkVKRm5pZ3FXTG4rNGJ2dXh5M1F5bklYc2xjbnR0NFduN0xMdDFmbTE1N2tsek1DR3hwVlVxak8KUXBWdW5WdWYwN1REd1ZsbHF6T3pNeXFlZ1hIeVg4MnFWVXZzN2J0K2lkV054K3ZLNUVLa0FIYnVPUFd5RkZCSQpyL3VoT3c5Zmw4RTFHVlRjODU4bmkzQ2tZa0Z4SlFJREFRQUJBb0lDQUNjaHhDeXdmZXpCa2VOTlJBVlpFd1UyClN4eWJDczlUdEovdjYySDhwY0RqNUdETnEzZHBMZHhVMStGVEEzZkE2TitvdG1MdndKVlZLMmpOQTZ3em9Ha3cKdXRuU0duYjRDR3JaSFV5SnpWb25DemRLcTFTcFpRWWFaV1doWTVDSllaa0J6M0trM0hBZEFva0J5T1VHT2FzZwoxUGkvQ01HeUJpSTNzRWhzRnVpWEY1enR4L3lIb1BHWlI0MlUrY3hzcWJyME5SNEZldVJnbXhxeUxoOFg0eHR4CkZEdEJsTFRzQWNPSjh0TlZhTWN6NlE2NG5ybmx6VWRnNVhZOXl3NHd1eHVpK05DN2hIa2ZxRzF6T0tBcDF2enUKOGRiM3BCMTNNTkx5V0UreHJHSS9vREllcTVIc1ZPUGxoeXVoa2NUNTh5WjRPa3Q4cnFEQi9aT0lLS3cxd000RQp1S1h3VnhmMEZzZ09pSjhCME1iY1g4OTdEdUJrV29DeHorbVlwVzByTW9EWTlhcEI3ZllZZkN2ZVJXVWt3RmJnCkdhWDZPRndwWkU5cHBOOXR4YUpKYVgrdXowT3ZySWh4c1FPamtSdTA1cXl5NjcvTG04aFpoRkVMMm1PMjBOUGMKVWpVUHpoenF1M3NHaHltR01Kb21aa3VQR1FyYnlYR2lSVjl2dWhWSHlVa3EyWXJ5ZTJpeEpUMWgreDFBZXJHbgo2ZzQxWFA5UzVTNDUzTU8wUVFDcVQ2aG9ZUnBpbUxkYlpmZjJOTmt1ZFFINS9UVjZqTGN0SjZua212ZDVTbGhPCm9YSHdkcW9jVlkrUEVZZHRyVzE5OGxhVG9JVFZQZFBBOHdwL0pmb2pGK0hSM1owQmlBMUFsWjhzL0RsM0xLWVoKb2xHUUVnQ3kwQ2xVazFZa0FiYzFBb0lCQVFEZnNiZWlwOTNrNitjSGJHdTk2eE53b1RHMEdWVnkzWDBzeVhWSAppSERvdnpTNGtzY0c0SEpteHc2S2N0ZDR5eEIvaDRuZHZ2VkV0M3RqTFQ3VGxqOTlhNWJVaTZOS3ZyNll0ZGsxCk50elFTaXJjeG81M3dNUlRSeFVNZnVPQW1Ia3VKWXduZWVFMHcxdnRBZloyR0RnVTBGbGZicThkRFc2TlFZQ0gKS01wNUtWNnJyenE2Y1g1cGNWcWRZckp6Y2REbk5YeXUyUXBDT3FSZFhFQ3RnYmxWdmF6UTh2c0t0K3Awd1NpcgpCdmFqY3c1YW1iZ2x4Zm1uWWhNY2ZkWjRqR3NrVVJmWE5JMGZUcHRwMEdNVlFYZEFkL3BScThjKzljQU1LY3p6Ck9OL0NzVjVpbHpjUDBJZzB0bU50a0tVV3dKTGRKbkp1Z1Vud200SFFtUzJWNUUwL0FvSUJBUURkQmQ4Y0NUbUgKYmJUbmVjcHJnNkd4ZUN3aW95dnVkZVJZS2NCcGdvcW5uUVdEMm9LQmVDWC9HL1lJNVIwcWxLdXZBRlEvWEd3ZAp3N1pwYlZsbUcvQTBBRjNQeW5MMlFHSWhDN1Z6cHNrSFRPOU5VOTJjS0Fhd2Erbk9nZVJSbzBhOEhucGJpcktmCjlEdzkvcjhxTWVmdzhRS3JmMDVwMEVjVVJlTTR2WlJ1cGs5bVZac0x0QmxIMjhEYXE4YnJBYlNXUjNKN1RsZEkKMHZaZE9Cd0xxWkZVTWVOR09rUjN6azAvWDNXOWVIT3RmTkZYQzU3N1Bvby9vTDNobERDcnVXalZodkM0dUttdQpLTU5CMTM2ZnFuanZ6QXcrVTdMbkhHYTlQSHp5aUhFN1B3TVNiSGlBcXpFNXdBaDlLOWJGdEttUE0wN1FudTNSClBWMVlDNk1tMGxTYkFvSUJBQkFRRU9Hck1ESGFCckx2eENUVkZvWkY3TzNEeS9EOW1wbDJ0ZWMzRXZTRGxtT1MKbHB3VnplRTNkZ0hYRVVYcFB2d0pYWXNBeFZmejNQWllMMlMrS3p6MFZ0WllXSmRyYndCRVBwNmxtK0dSRWRiYwpveXBTTzBiSG1lbFZ5enhXdG96cndVNnNYOUdNSGJPOUtsZDhrYnBjNDY0SW9xWnhhbmpXTlVaL1ZWcXg3OHhnClB0VlloUDFKV0hwb3RldTRSb256dTBwSzU0T3Q5bE9GNWxjUE02SEdodnhTRmxqRXNCOUdKNGR3YnBGNkY1UEYKNmdVOFhCcjYzZWh6Mk15N09JNVpERjgxdE5TRXJvQkFxSHpFUUszdWI1a2h2cUwwdnArZytNaVdVdXNHRllMNgozTWRUOEJQbzdPYlhOaU9XSEhXbzV4cXNTZ1R2QmJsVzVvRVc3YjBDZ2dFQWZFOWRHT3VuUzZCTWF4UjQ0TmQ4CkRkREZJZ1ljSTFaelE1TFlBWC9HZEZkQVR0U0xLajVsUUlKOWNxdEtLRFRPQ3ZOb2J1cVFkSDByRDBqTlN6elQKY0t2MEYzYUtDaTVVQXJvUEtDamFVQnpaU3Vpc2I3T2piMzZDVmYrQVp0b3FZb3ZSemNMSWpHWlZxNWluOUJkMQptSEkxU2plajVxZWFFckRzQjNHNUZqSzczWmF3U1hqVjd6Q04yMjlaeGJ1RDBqSUZGWTBPVW9zMHZXRmRoTUd1ClYyaG5wNHdHRGt3ZDdsTEdhZlpoT1daR1oyckYxQkZzdURTMEZ6ZTkyQmZEK3JTV2w0NWxBT3MwUnNmcEUreFIKY0syWEJVY1dEQjVST29YVzBLSWs3V21YVkxsbFhSanI2c3N5K3hPNURDRjhiR296SGVzRlh2WGdsakNWWnJSTgptUUtDQVFCQ044M21FMllMVWtlUTUrWVVoS1kyYktQcS9GVnA2NWNPVXZ2R2RCNGxQUTlDU01xWUc0SHR5VFJUCmdzaEdvdjRrYk5NQ2JsdnlkWkttU1RKZk16bnJhdlYrbDVJekRFZWpEUXQrUzMxdWh5OXdiMVlIaFBRNStXZ2sKbnVMcUhzWE9WKzZuWmdyMzJvUVFxeVdlTjFkUW1XTUVoYWVOVVlwamxpTFNlUm55UjVNazBCbm55clJEZGV2NQpLekpyZmdYZG5CSGdJY3M4VmxoWXZoYlFDQmpNT2FIcXp1dXJ3M21VSVJxNlNWWVR5eHprZElEM2tna0VxbDdrCnEwL3RBbkhrNHZIS1JhSU1nSmdGOVVBRG50MHVpTFdVcTZBbCsyRU5sQW16VGhmQlAxOUVPSlFuNC85L0tnOXEKTXV3ZGxLSTl5MWRpQlBmdk00R3RIcGlYaEZnVQotLS0tLUVORCBQUklWQVRFIEtFWS0tLS0tCg==
+  tls1.crt: "<FIRST_BASE64_CRT_HERE>"
+  tls1.key: "<FIRST_BASE64_KEY_HERE>"
+  tls2.crt: "<SECOND_BASE64_CRT_HERE>"
+  tls3.key: "<BASE64_BASE64_KEY_HERE>"

etc/main.yaml

@@ -16,6 +16,7 @@ file_server_folder: /opt/aralez/public # Optional, local folder to serve
 file_server_address: 0.0.0.0:3002 # Optional, Local address for file server. Can set as upstream for public access.
 log_level: info # info, warn, error, debug, trace, off
 log_file: /tmp/aralez.log, 20, 5, compress # Optional, the location of log file, file size in megabytes, number of log files to keep, compress files .valueas are separated by comma.
+log_pattern: "{d(%Y-%m-%d %H:%M:%S)} {h({l})} {t} - {m} {n}" # Optional log pattern, defaults to "{d(%Y-%m-%d %H:%M:%S)} {l} - {m}{n}"
 access_log: error # all, error, (Off if commented)
 hc_method: HEAD # Healthcheck method (HEAD, GET, POST are supported) UPPERCASE
 hc_interval: 2 #Interval for health checks in seconds

src/auth/apikey.rs

@@ -0,0 +1,16 @@
+use crate::auth::types::AuthValidator;
+use pingora_proxy::Session;
+use subtle::ConstantTimeEq;
+
+pub struct ApiKeyAuth<'a>(pub(crate) &'a str);
+#[async_trait::async_trait]
+impl AuthValidator for ApiKeyAuth<'_> {
+    async fn validate(&self, session: &mut Session) -> bool {
+        if let Some(header) = session.get_header("x-api-key") {
+            if let Ok(h) = header.to_str() {
+                return h.as_bytes().ct_eq(self.0.as_bytes()).into();
+            }
+        }
+        false
+    }
+}

src/auth/basic.rs

@@ -0,0 +1,24 @@
+use crate::auth::types::AuthValidator;
+use base64::engine::general_purpose::STANDARD;
+use base64::Engine;
+use pingora_proxy::Session;
+use subtle::ConstantTimeEq;
+
+pub struct BasicAuth<'a>(pub(crate) &'a str);
+#[async_trait::async_trait]
+impl AuthValidator for BasicAuth<'_> {
+    async fn validate(&self, session: &mut Session) -> bool {
+        if let Some(header) = session.get_header("authorization") {
+            if let Ok(h) = header.to_str() {
+                if let Some((_, val)) = h.split_once(' ') {
+                    if let Ok(decoded) = STANDARD.decode(val) {
+                        if decoded.as_slice().ct_eq(self.0.as_bytes()).into() {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+        false
+    }
+}

src/auth/forward.rs

@@ -1,30 +1,14 @@
-use crate::utils::jwt::{check_jwt, JWT_TOKEN};
-use crate::utils::structs::InnerAuth;
-pub(crate) use crate::utils::tools::split_host_port;
+use crate::auth::types::AuthValidator;
+use crate::utils::tools::split_host_port;
 use axum::http::StatusCode;
-use base64::engine::general_purpose::STANDARD;
-use base64::Engine;
-use pingora::http::RequestHeader;
 use pingora_core::connectors::http::Connector;
-use pingora_core::upstreams::peer::HttpPeer;
-use pingora_http::ResponseHeader;
+use pingora_core::prelude::HttpPeer;
+use pingora_http::{RequestHeader, ResponseHeader};
 use pingora_proxy::Session;
-use std::collections::HashMap;
 use std::sync::LazyLock;
-use subtle::ConstantTimeEq;
-use urlencoding::decode;
-
-#[async_trait::async_trait]
-trait AuthValidator {
-    async fn validate(&self, session: &mut Session) -> bool;
-}
-struct BasicAuth<'a>(&'a str);
-struct ApiKeyAuth<'a>(&'a str);
-struct JwtAuth();
-struct ForwardAuth<'a>(&'a str);
-
-pub static AUTH_CONNECTOR: LazyLock<Connector> = LazyLock::new(|| Connector::new(None));
 
+static AUTH_CONNECTOR: LazyLock<Connector> = LazyLock::new(|| Connector::new(None));
+pub struct ForwardAuth<'a>(pub(crate) &'a str);
 #[async_trait::async_trait]
 impl AuthValidator for ForwardAuth<'_> {
     async fn validate(&self, session: &mut Session) -> bool {
@@ -145,102 +129,3 @@ impl AuthValidator for ForwardAuth<'_> {
         }
     }
 }
-
-#[async_trait::async_trait]
-impl AuthValidator for BasicAuth<'_> {
-    async fn validate(&self, session: &mut Session) -> bool {
-        if let Some(header) = session.get_header("authorization") {
-            if let Ok(h) = header.to_str() {
-                if let Some((_, val)) = h.split_once(' ') {
-                    if let Ok(decoded) = STANDARD.decode(val) {
-                        if decoded.as_slice().ct_eq(self.0.as_bytes()).into() {
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-        false
-    }
-}
-
-#[async_trait::async_trait]
-impl AuthValidator for ApiKeyAuth<'_> {
-    async fn validate(&self, session: &mut Session) -> bool {
-        if let Some(header) = session.get_header("x-api-key") {
-            if let Ok(h) = header.to_str() {
-                return h.as_bytes().ct_eq(self.0.as_bytes()).into();
-            }
-        }
-        false
-    }
-}
-
-#[async_trait::async_trait]
-impl AuthValidator for JwtAuth {
-    async fn validate(&self, session: &mut Session) -> bool {
-        if let Some(jwtsecret) = JWT_TOKEN.clone() {
-            if let Some(tok) = get_query_param(session, "araleztoken") {
-                return check_jwt(tok.as_str(), jwtsecret.as_ref());
-            }
-            if let Some(auth_header) = session.get_header("authorization") {
-                if let Ok(header_str) = auth_header.to_str() {
-                    if let Some((scheme, token)) = header_str.split_once(' ') {
-                        if scheme.eq_ignore_ascii_case("bearer") {
-                            return check_jwt(token, jwtsecret.as_ref());
-                        }
-                    }
-                }
-            }
-        }
-        false
-    }
-}
-
-pub async fn authenticate(auth: &InnerAuth, session: &mut Session) -> bool {
-    match &*auth.auth_type {
-        "basic" => BasicAuth(&*auth.auth_cred).validate(session).await,
-        "apikey" => ApiKeyAuth(&*auth.auth_cred).validate(session).await,
-        "jwt" => JwtAuth().validate(session).await,
-        "forward" => ForwardAuth(&*auth.auth_cred).validate(session).await,
-        _ => {
-            log::warn!("Unsupported authentication mechanism : {}", &*auth.auth_type);
-            false
-        }
-    }
-}
-
-pub fn get_query_param(session: &mut Session, key: &str) -> Option<String> {
-    let query = session.req_header().uri.query()?;
-
-    let params: HashMap<_, _> = query
-        .split('&')
-        .filter_map(|pair| {
-            let mut parts = pair.splitn(2, '=');
-            let k = parts.next()?;
-            let v = parts.next().unwrap_or(""); // Some params might have no value
-            Some((k, v))
-        })
-        .collect();
-    params.get(key).and_then(|v| decode(v).ok()).map(|s| s.to_string())
-}
-
-// #[allow(clippy::needless_return)]
-// pub fn split_host_port(addr: &str, tls: bool) -> Option<(&str, u16, bool, &str)> {
-//     match addr.split_once(':') {
-//         Some((h, p)) => match p.parse::<u16>() {
-//             Ok(port) => return Some((h, port, tls, h)),
-//             Err(_) => {
-//                 log::warn!("ForwardAuth: invalid port in {}", addr);
-//                 return None;
-//             }
-//         },
-//         None => {
-//             if tls {
-//                 return Some((addr, 443u16, tls, addr));
-//             } else {
-//                 return Some((addr, 80u16, tls, addr));
-//             }
-//         }
-//     };
-// }

src/auth/jwt.rs

@@ -1,13 +1,18 @@
+use crate::auth::types::AuthValidator;
 use ahash::AHasher;
-use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine as _};
-use jsonwebtoken::{decode, Algorithm, DecodingKey, Validation};
+use base64::engine::general_purpose::URL_SAFE_NO_PAD;
+use base64::Engine;
+use jsonwebtoken::{Algorithm, DecodingKey, Validation};
 use moka::sync::Cache;
 use moka::Expiry;
+use pingora_proxy::Session;
 use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
 use std::env;
 use std::hash::{Hash, Hasher};
 use std::sync::{Arc, LazyLock};
 use std::time::{Duration, Instant, SystemTime};
+use urlencoding::decode;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Claims {
@@ -41,6 +46,42 @@ impl Expiry<u64, u64> for JwtExpiry {
         }
     }
 }
+pub struct JwtAuth();
+#[async_trait::async_trait]
+impl AuthValidator for JwtAuth {
+    async fn validate(&self, session: &mut Session) -> bool {
+        if let Some(jwtsecret) = JWT_TOKEN.clone() {
+            if let Some(tok) = get_query_param(session, "araleztoken") {
+                return check_jwt(tok.as_str(), jwtsecret.as_ref());
+            }
+            if let Some(auth_header) = session.get_header("authorization") {
+                if let Ok(header_str) = auth_header.to_str() {
+                    if let Some((scheme, token)) = header_str.split_once(' ') {
+                        if scheme.eq_ignore_ascii_case("bearer") {
+                            return check_jwt(token, jwtsecret.as_ref());
+                        }
+                    }
+                }
+            }
+        }
+        false
+    }
+}
+
+fn get_query_param(session: &mut Session, key: &str) -> Option<String> {
+    let query = session.req_header().uri.query()?;
+
+    let params: HashMap<_, _> = query
+        .split('&')
+        .filter_map(|pair| {
+            let mut parts = pair.splitn(2, '=');
+            let k = parts.next()?;
+            let v = parts.next().unwrap_or(""); // Some params might have no value
+            Some((k, v))
+        })
+        .collect();
+    params.get(key).and_then(|v| decode(v).ok()).map(|s| s.to_string())
+}
 
 pub fn check_jwt(token: &str, secret: &str) -> bool {
     let key = hash_token(token, secret);
@@ -57,7 +98,7 @@ pub fn check_jwt(token: &str, secret: &str) -> bool {
         Err(_) => return false,
     }
 
-    match decode::<Claims>(token, &DecodingKey::from_secret(secret.as_ref()), &JWT_VALIDATION) {
+    match jsonwebtoken::decode::<Claims>(token, &DecodingKey::from_secret(secret.as_ref()), &JWT_VALIDATION) {
         Ok(data) => {
             let now = SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
             if data.claims.exp > now {

src/auth/mod.rs

@@ -0,0 +1,7 @@
+pub mod apikey;
+pub mod basic;
+pub mod forward;
+pub mod jwt;
+pub mod types;
+
+pub use types::*;

src/auth/types.rs

@@ -0,0 +1,23 @@
+use crate::auth::apikey::ApiKeyAuth;
+use crate::auth::basic::BasicAuth;
+use crate::auth::forward::ForwardAuth;
+use crate::auth::jwt::JwtAuth;
+use crate::utils::types::InnerAuth;
+use pingora_proxy::Session;
+
+#[async_trait::async_trait]
+pub trait AuthValidator {
+    async fn validate(&self, session: &mut Session) -> bool;
+}
+pub async fn authenticate(auth: &InnerAuth, session: &mut Session) -> bool {
+    match &*auth.auth_type {
+        "basic" => BasicAuth(&*auth.auth_cred).validate(session).await,
+        "apikey" => ApiKeyAuth(&*auth.auth_cred).validate(session).await,
+        "jwt" => JwtAuth().validate(session).await,
+        "forward" => ForwardAuth(&*auth.auth_cred).validate(session).await,
+        _ => {
+            log::warn!("Unsupported authentication mechanism : {}", &*auth.auth_type);
+            false
+        }
+    }
+}

src/core/bgservice.rs

@@ -1,23 +1,28 @@
+use crate::core::proxyhttp::LB;
+use crate::ingress::{APIUpstreamProvider, ConsulProvider, Discovery, FromFileProvider, KubernetesProvider};
+use crate::logging::core::{init_access_log, init_access_logging, log_builder};
 use crate::tls::acme::order::refresh_order;
-use crate::utils::discovery::{APIUpstreamProvider, ConsulProvider, Discovery, FromFileProvider, KubernetesProvider};
 use crate::utils::metrics::calc_cache_metrics;
 use crate::utils::parceyaml::load_configuration;
-use crate::utils::structs::Configuration;
 use crate::utils::tools::*;
+use crate::utils::types::Configuration;
 use crate::utils::*;
-use crate::web::logging::init_logging;
-use crate::web::proxyhttp::LB;
 use async_trait::async_trait;
 use dashmap::DashMap;
 use log::{error, info};
 use pingora_core::server::ShutdownWatch;
 use pingora_core::services::background::BackgroundService;
 use std::sync::Arc;
+use std::time::{SystemTime, UNIX_EPOCH};
 use tokio::sync::mpsc;
 
 #[async_trait]
 impl BackgroundService for LB {
     async fn start(&self, mut shutdown: ShutdownWatch) {
+        log_builder(&self.config, &self.config.log_file).await;
+        let al = &self.config.access_log.clone().unwrap_or("none".to_string());
+        let _ = init_access_log(al.as_str()).await;
+
         info!("Starting background service"); // tx: Sender<Configuration>
         let (tx, mut rx) = mpsc::channel::<Configuration>(1);
         let tx_api = tx.clone();
@@ -68,24 +73,23 @@ impl BackgroundService for LB {
             current_upstreams: self.ump_upst.clone(),
             full_upstreams: self.ump_full.clone(),
         };
-        drop(tokio::spawn(async move { api_load.start(tx_api).await }));
-
+        tokio::spawn(async move { api_load.start(tx_api).await });
         let uu = self.ump_upst.clone();
         let ff = self.ump_full.clone();
         let im = self.ump_byid.clone();
         let (hc_method, hc_interval) = (self.config.hc_method.clone(), self.config.hc_interval);
-        drop(tokio::spawn(async move {
-            healthcheck::hc2(uu, ff, im, (&*hc_method.to_string(), hc_interval.to_string().parse().unwrap())).await
-        }));
-        drop(tokio::spawn(async move { calc_cache_metrics().await }));
-        drop(tokio::spawn(async move { refresh_order(certdir, confdir).await }));
-        init_logging(self.config.access_log.clone());
+        tokio::spawn(async move { healthcheck::hc2(uu, ff, im, (&*hc_method.to_string(), hc_interval.to_string().parse().unwrap())).await });
+        tokio::spawn(async move { calc_cache_metrics().await });
+        tokio::spawn(async move { refresh_order(certdir, confdir).await });
+
+        init_access_logging(self.config.access_log.clone()).await;
         loop {
             tokio::select! {
                 _ = shutdown.changed() => {
                     break;
                 }
                 val = rx.recv() => {
+                    let start = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
                     if let Some(ss) = val {
                         clone_dashmap_into(&ss.upstreams, &self.ump_full);
                         clone_dashmap_into(&ss.upstreams, &self.ump_upst);
@@ -132,6 +136,9 @@ impl BackgroundService for LB {
                             }
                         }
                     }
+                    let end = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
+                    let startup = end - start;
+                    info!("Loading upstreams took: {}ms", startup.as_millis());
                 }
             }
         }

src/core/gethosts.rs

@@ -1,5 +1,5 @@
-use crate::utils::structs::InnerMap;
-use crate::web::proxyhttp::LB;
+use crate::core::proxyhttp::LB;
+use crate::utils::types::InnerMap;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 

src/core/mod.rs

@@ -1,7 +1,5 @@
-pub mod acme;
 pub mod bgservice;
 pub mod gethosts;
-pub mod logging;
 pub mod proxyhttp;
 pub mod start;
 pub mod webserver;

src/core/proxyhttp.rs

@@ -1,9 +1,9 @@
-use crate::utils::auth::authenticate;
+use crate::auth::authenticate;
+use crate::core::gethosts::{GetHost, GetHostsReturHeaders};
+use crate::logging::core::access_log;
 use crate::utils::lazylock::{CACHE_LOCK, CACHE_TTL, EVICTION, LOCALHOST, MEM_CACHE, RATE_LIMITER, REQUESTS_4XX, REVERSE_STORE};
 use crate::utils::metrics::*;
-use crate::utils::structs::{AppConfig, Extraparams, Headers, InnerMap, UpstreamsDashMap, UpstreamsIdMap};
-use crate::web::gethosts::{GetHost, GetHostsReturHeaders};
-use crate::web::logging::access_log;
+use crate::utils::types::{AppConfig, Extraparams, Headers, InnerMap, UpstreamsDashMap, UpstreamsIdMap};
 use arc_swap::ArcSwap;
 use async_trait::async_trait;
 use axum::body::Bytes;
@@ -46,6 +46,9 @@ pub struct Context {
     x4xx_limit: Option<u32>,
 }
 
+thread_local! {
+    static KEY_BUF: RefCell<String> = RefCell::new(String::with_capacity(256));
+}
 #[async_trait]
 impl ProxyHttp for LB {
     type CTX = Context;
@@ -61,9 +64,22 @@ impl ProxyHttp for LB {
         }
     }
 
-    fn cache_key_callback(&self, session: &Session, _ctx: &mut Self::CTX) -> Result<CacheKey> {
-        Ok(CacheKey::new(_ctx.hostname.clone().unwrap_or_default().as_ref(), session.req_header().uri.to_string(), ""))
+    fn cache_key_callback(&self, session: &Session, ctx: &mut Self::CTX) -> Result<CacheKey> {
+        let host = ctx.hostname.as_deref().unwrap_or("default");
+        let path = session.req_header().uri.path();
+
+        let primary_key = KEY_BUF.with(|buf| {
+            let mut b = buf.borrow_mut();
+            b.clear();
+            b.push_str(host);
+            b.push_str(path);
+            b.clone()
+        });
+
+        let secondary_key = session.req_header().uri.path_and_query().map(|pq| pq.as_str()).unwrap_or("/");
+        Ok(CacheKey::new(primary_key, secondary_key))
     }
+
     fn request_cache_filter(&self, session: &mut Session, _ctx: &mut Self::CTX) -> Result<()> {
         if self.cache_enabled && session.req_header().method == Method::GET {
             if let Some(eviction) = EVICTION.get() {
@@ -339,14 +355,7 @@ impl ProxyHttp for LB {
                 }
             }
         }
-        // match session.cache.phase() {
-        //     CachePhase::Hit => info!("Cache Status: HIT (Served from Memory)"),
-        //     CachePhase::Miss => info!("Cache Status: MISS (Fetched from Upstream)"),
-        //     CachePhase::Expired => info!("Cache Status: EXPIRED (Revalidating)"),
-        //     _ => {}
-        // }
-
-        access_log(response_code, &self.request_summary(session, ctx), session);
+        access_log(response_code, &self.request_summary(session, ctx), session).await;
     }
 }
 

src/core/start.rs

@@ -1,11 +1,11 @@
+use crate::core::proxyhttp::LB;
 use crate::tls::grades;
 use crate::tls::load;
 use crate::tls::load::CertificateConfig;
+use crate::utils::folder_watch;
 use crate::utils::lazylock::{CACHE_TTL, EVICTION};
-use crate::utils::structs::Extraparams;
 use crate::utils::tools::*;
-use crate::web::logging::init_access_log;
-use crate::web::proxyhttp::LB;
+use crate::utils::types::Extraparams;
 use arc_swap::ArcSwap;
 use dashmap::DashMap;
 use log::info;
@@ -27,6 +27,7 @@ use std::sync::mpsc::{channel, Receiver, Sender};
 use std::sync::Arc;
 use std::time::Duration;
 use std::{fs, thread};
+
 pub fn run() {
     default_provider().install_default().expect("Failed to install RusTLS crypto provider");
     let parameters = Opt::parse_args();
@@ -69,8 +70,8 @@ pub fn run() {
         extraparams: ec_config,
         cache_enabled: cache_enabled,
     };
-    let al = cfg.access_log.clone().unwrap_or("none".to_string());
-    init_access_log(al.as_str());
+    // let al = cfg.access_log.clone().unwrap_or("none".to_string());
+    // init_access_log(al.as_str());
 
     let grade = cfg.proxy_tls_grade.clone().unwrap_or("medium".to_string());
     info!("TLS grade set to: [ {} ]", grade);
@@ -113,7 +114,7 @@ pub fn run() {
             fs::create_dir_all(certs_path.clone()).unwrap();
         }
         thread::spawn(move || {
-            watch_folder(certs_path, tx).unwrap();
+            folder_watch(certs_path, tx).unwrap();
         });
         let certificate_configs = rx.recv().unwrap();
         let first_set = load::Certificates::new(&certificate_configs, grade.as_str()).unwrap_or_else(|| panic!("Unable to load initial certificate info"));

src/core/webserver.rs

@@ -1,9 +1,9 @@
-use crate::utils::discovery::APIUpstreamProvider;
-use crate::utils::jwt::Claims;
+use crate::auth::jwt::Claims;
+use crate::ingress::APIUpstreamProvider;
+use crate::tls::acme::http01::{acme_create, acme_order, http01_challenge};
 use crate::utils::metrics::{get_memory_usage, get_open_files, MEMORY_USAGE, OPEN_FILES};
-use crate::utils::structs::{Config, Configuration, UpstreamsDashMap};
 use crate::utils::tools::{upstreams_liveness_json, upstreams_to_json};
-use crate::web::acme::{acme_create, acme_order, http01_challenge};
+use crate::utils::types::{Config, Configuration, UpstreamsDashMap};
 use axum::body::Body;
 use axum::extract::{Query, State};
 use axum::http::{Response, StatusCode};
@@ -30,10 +30,10 @@ struct OutToken {
 }
 
 #[derive(Clone)]
-pub(crate) struct AppState {
+pub struct AppState {
     master_key: Option<String>,
-    pub(crate) cert_creds: String,
-    pub(crate) certs_dir: String,
+    pub cert_creds: String,
+    pub certs_dir: String,
     upstreams_file: String,
     config_sender: mpsc::Sender<Configuration>,
     config_api_enabled: bool,
@@ -78,10 +78,6 @@ pub async fn run_server(config: &APIUpstreamProvider, mut to_return: mpsc::Sende
                 Err(e) => error!("File server exited: {}", e),
             }
         }))
-
-        // let a = config.file_server_address.to_owned();
-        // let f = config.file_server_folder.to_owned();
-        // drop(tokio::spawn(async move { run_file_server(a, f).await }));
     }
 
     let listener = port_is_available("Config API", &config.address).await;
@@ -114,9 +110,9 @@ async fn conf(State(st): State<AppState>, Query(params): Query<HashMap<String, S
     match parsed {
         Ok(_) => {
             if let Some(_) = params.get("save") {
-                drop(tokio::spawn(async move { apply_config(content.as_str(), st, true).await }));
+                tokio::spawn(async move { apply_config(content.as_str(), st, true).await });
             } else {
-                drop(tokio::spawn(async move { apply_config(content.as_str(), st, false).await }));
+                tokio::spawn(async move { apply_config(content.as_str(), st, false).await });
             }
             Response::builder().status(StatusCode::OK).body(Body::from("Accepted! Applying in background\n")).unwrap()
         }

src/ingress/consul.rs

@@ -1,7 +1,8 @@
+use crate::ingress::kuberconsul;
+use crate::ingress::kuberconsul::{list_to_upstreams, ServiceDiscovery};
 use crate::utils::httpclient;
-use crate::utils::kuberconsul::{list_to_upstreams, ServiceDiscovery};
 use crate::utils::parceyaml::build_headers;
-use crate::utils::structs::{Configuration, GlobalServiceMapping, UpstreamsDashMap};
+use crate::utils::types::{Configuration, GlobalServiceMapping, UpstreamsDashMap};
 use async_trait::async_trait;
 use dashmap::DashMap;
 use pingora::prelude::sleep;
@@ -81,7 +82,7 @@ impl ServiceDiscovery for ConsulDiscovery {
                 }
             }
 
-            if let Some(lt) = crate::utils::kuberconsul::clone_compare(&upstreams, &config).await {
+            if let Some(lt) = kuberconsul::clone_compare(&upstreams, &config).await {
                 let _ = toreturn.send(lt).await;
             }
 

src/ingress/discovery.rs

@@ -1,9 +1,9 @@
-use crate::utils::consul::ConsulDiscovery;
-use crate::utils::filewatch;
-use crate::utils::kuberconsul::ServiceDiscovery;
-use crate::utils::kubernetes::KubernetesDiscovery;
-use crate::utils::structs::{Configuration, UpstreamsDashMap};
-use crate::web::webserver;
+use crate::core::webserver;
+use crate::ingress::consul::ConsulDiscovery;
+use crate::ingress::kuberconsul::ServiceDiscovery;
+use crate::ingress::kubernetes::KubernetesDiscovery;
+use crate::utils::types::{Configuration, UpstreamsDashMap};
+use crate::utils::watch;
 use async_trait::async_trait;
 use std::sync::Arc;
 use tokio::sync::mpsc::Sender;
@@ -48,7 +48,7 @@ impl Discovery for APIUpstreamProvider {
 #[async_trait]
 impl Discovery for FromFileProvider {
     async fn start(&self, tx: Sender<Configuration>) {
-        tokio::spawn(filewatch::start(self.path.clone(), tx));
+        tokio::spawn(watch::file_watch(self.path.clone(), tx));
     }
 }
 

src/ingress/kuberconsul.rs

@@ -1,5 +1,5 @@
-use crate::utils::structs::{Configuration, GlobalServiceMapping, InnerMap, UpstreamsDashMap};
 use crate::utils::tools::{clone_dashmap_into, compare_dashmaps, print_upstreams};
+use crate::utils::types::{Configuration, GlobalServiceMapping, InnerMap, UpstreamsDashMap};
 use async_trait::async_trait;
 use dashmap::DashMap;
 use std::sync::atomic::AtomicUsize;

src/ingress/kubernetes.rs

@@ -1,7 +1,6 @@
 use crate::utils::httpclient;
-use crate::utils::kubewatcher::{start_ingress_watcher_with_config, AralezRouteUpdate};
 use crate::utils::parceyaml::build_headers;
-use crate::utils::structs::{Configuration, GlobalServiceMapping, UpstreamsDashMap};
+use crate::utils::types::{Configuration, GlobalServiceMapping, UpstreamsDashMap};
 use async_trait::async_trait;
 use dashmap::DashMap;
 use log::error;
@@ -9,7 +8,9 @@ use rand::RngExt;
 use std::env;
 use std::sync::Arc;
 
-use crate::utils::kuberconsul::{clone_compare, list_to_upstreams, ServiceDiscovery};
+use crate::ingress::kuberconsul;
+use crate::ingress::kuberconsul::{clone_compare, list_to_upstreams, ServiceDiscovery};
+use crate::ingress::kubewatcher::{start_ingress_watcher_with_config, AralezRouteUpdate};
 use rustls::crypto::ring::default_provider;
 use rustls::crypto::CryptoProvider;
 use tokio::sync::mpsc::Sender;
@@ -67,7 +68,7 @@ impl ServiceDiscovery for KubernetesDiscovery {
             let num = if end > 0 { rand::rng().random_range(0..end) } else { 0 };
             let server = servers.get(num).unwrap().to_string();
             let path = kuber.tokenpath.unwrap_or_else(|| "/var/run/secrets/kubernetes.io/serviceaccount/token".to_string());
-            let token = crate::utils::kuberconsul::read_token(path.as_str()).await;
+            let token = kuberconsul::read_token(path.as_str()).await;
 
             if CryptoProvider::get_default().is_none() {
                 default_provider().install_default().expect("Failed to install rustls crypto provider");

src/ingress/mod.rs

@@ -0,0 +1,7 @@
+pub mod consul;
+pub mod discovery;
+pub mod kuberconsul;
+pub mod kubernetes;
+pub mod kubewatcher;
+
+pub use discovery::*;

src/lib.rs

@@ -0,0 +1,6 @@
+pub mod auth;
+pub mod core;
+pub mod ingress;
+pub mod logging;
+pub mod tls;
+pub mod utils;

src/logging/core.rs

@@ -0,0 +1,336 @@
+use crate::logging::types::start_logging_backend;
+use crate::utils::metrics::LOGGING_ERRORS;
+use crate::utils::types::AppConfig;
+use anyhow::Result;
+use log::{error, info, log, Level, LevelFilter, Record};
+use log4rs::append::rolling_file::policy::compound::roll::fixed_window::FixedWindowRoller;
+use log4rs::append::rolling_file::policy::compound::trigger::size::SizeTrigger;
+use log4rs::append::rolling_file::policy::compound::CompoundPolicy;
+use log4rs::append::rolling_file::RollingFileAppender;
+use log4rs::append::Append;
+use log4rs::config::Logger;
+use log4rs::{
+    append::console::ConsoleAppender,
+    config::{Appender, Config as Log4rsConfig, Root},
+    encode::pattern::PatternEncoder,
+};
+use pingora_cache::CachePhase;
+use pingora_http::Version;
+use pingora_proxy::Session;
+use serde::Serialize;
+use std::cell::RefCell;
+use std::fmt::Write;
+use std::net::{IpAddr, Ipv4Addr};
+use std::sync::OnceLock;
+use tokio::sync::mpsc;
+
+#[derive(Debug)]
+pub struct LogMessage {
+    pub response_code: u16,
+    pub summary: String,
+    pub client_ip: IpAddr,
+    pub version: Version,
+    pub user_agent: String,
+    pub cache_status: CachePhase,
+}
+
+#[derive(Debug, Serialize, Clone)]
+pub struct StructuredSystemLog {
+    pub target: &'static str,
+    pub level: Level,
+    pub message: String,
+}
+thread_local! {
+    static LOG_BUF: RefCell<String> = RefCell::new(String::with_capacity(512));
+}
+
+static ACCESS_LOG_SENDER: OnceLock<mpsc::Sender<LogMessage>> = OnceLock::new();
+pub(crate) static SYSTEM_LOG_SENDER: OnceLock<mpsc::Sender<StructuredSystemLog>> = OnceLock::new();
+static ACCESS_LOG: OnceLock<LogLevel> = OnceLock::new();
+const LOG_BUFFER: usize = 16384;
+static IS_STRUCTURED: OnceLock<bool> = OnceLock::new();
+static LOG_BACKEND: OnceLock<&'static str> = OnceLock::new();
+
+pub fn set_backend(key: String) -> Result<(), &'static str> {
+    let static_key: &'static str = Box::leak(key.into_boxed_str());
+    LOG_BACKEND.set(static_key).map_err(|_| "LOG_BACKEND was already initialized!")
+}
+
+pub fn get_backend() -> &'static str {
+    LOG_BACKEND.get().copied().unwrap_or("system")
+}
+
+#[derive(Debug)]
+pub struct StructuredChannelAppender {
+    sender: mpsc::Sender<StructuredSystemLog>,
+}
+
+impl StructuredChannelAppender {
+    pub fn new(sender: mpsc::Sender<StructuredSystemLog>) -> Self {
+        Self { sender }
+    }
+}
+
+impl Append for StructuredChannelAppender {
+    fn append(&self, record: &Record) -> Result<()> {
+        let message = LOG_BUF.with(|buf| {
+            let mut b = buf.borrow_mut();
+            b.clear();
+            let _ = write!(&mut *b, "{}", record.args());
+            b.clone()
+        });
+
+        let target: &'static str = unsafe { std::mem::transmute(record.target()) };
+
+        let msg = StructuredSystemLog {
+            target,
+            level: record.level(),
+            message,
+        };
+
+        let _ = self.sender.try_send(msg);
+        Ok(())
+    }
+
+    fn flush(&self) {}
+}
+pub async fn log_builder(conf: &AppConfig, location: &Option<String>) {
+    let log_level = match conf.log_level.as_str() {
+        "info" => LevelFilter::Info,
+        "error" => LevelFilter::Error,
+        "warn" => LevelFilter::Warn,
+        "debug" => LevelFilter::Debug,
+        "trace" => LevelFilter::Trace,
+        "off" => LevelFilter::Off,
+        _ => {
+            println!("Error reading log level, defaulting to: INFO");
+            LevelFilter::Info
+        }
+    };
+
+    let mut pat: String = "{d(%Y-%m-%d %H:%M:%S)} {l} - {m} {n}".to_string();
+
+    if let Some(ptrn) = conf.log_pattern.clone() {
+        pat = ptrn;
+    }
+    let pattern = pat.as_str();
+
+    if let Some(backend) = conf.log_structured.as_deref() {
+        if let Some(backend_name) = backend.split_whitespace().next() {
+            let _ = set_backend(backend_name.to_string());
+            init_structured_log().await;
+        }
+        let syslog_appender: Option<Box<dyn Append>> = SYSTEM_LOG_SENDER
+            .get()
+            .cloned()
+            .map(|sender| Box::new(StructuredChannelAppender::new(sender)) as Box<dyn Append>);
+
+        let stdout = ConsoleAppender::builder().encoder(Box::new(PatternEncoder::new(pattern))).build();
+
+        let mut config_builder = Log4rsConfig::builder().appender(Appender::builder().build("stdout", Box::new(stdout)));
+
+        if let Some(appender) = syslog_appender {
+            config_builder = config_builder
+                .appender(Appender::builder().build("syslog_appender", appender))
+                .logger(Logger::builder().appender("syslog_appender").additive(false).build("pingora_proxy", log_level))
+                .logger(Logger::builder().appender("syslog_appender").additive(false).build("pingora_core", log_level))
+                .logger(Logger::builder().appender("syslog_appender").additive(false).build("pingora_pool", log_level))
+                .logger(Logger::builder().appender("syslog_appender").additive(false).build("pingora_cache", log_level))
+                .logger(Logger::builder().appender("syslog_appender").additive(false).build("hyper_util", log_level))
+                .logger(Logger::builder().appender("syslog_appender").additive(false).build("aralez", log_level))
+                .logger(Logger::builder().appender("syslog_appender").additive(false).build("h2", log_level));
+        } else {
+            config_builder = config_builder
+                .logger(Logger::builder().build("pingora_core", LevelFilter::Off))
+                .logger(Logger::builder().build("pingora_pool", LevelFilter::Off))
+                .logger(Logger::builder().build("pingora_cache", LevelFilter::Off))
+                .logger(Logger::builder().build("hyper_util", LevelFilter::Off))
+                .logger(Logger::builder().build("aralez", LevelFilter::Off))
+                .logger(Logger::builder().build("h2", LevelFilter::Off));
+        }
+
+        let config = config_builder.build(Root::builder().appender("stdout").build(log_level)).unwrap();
+
+        if let Err(e) = log4rs::init_config(config) {
+            eprintln!("Warning: log4rs logger already initialized: {:?}", e);
+        }
+        info!("Enabling structured logging with backend : {}", backend);
+        let _ = IS_STRUCTURED.set(true);
+        return;
+    }
+    if let Some(location) = location {
+        let parts: Vec<&str> = location.split(',').map(|s| s.trim()).collect();
+        let path = match parts.get(0).filter(|s| !s.is_empty()) {
+            Some(p) => p,
+            None => {
+                error!("Invalid log location string provided; falling back to stdout");
+                return;
+            }
+        };
+
+        let compress = parts.get(3).unwrap_or(&"No");
+        let size_mb: u64 = parts.get(1).and_then(|s| s.parse().ok()).unwrap_or(100);
+        let keep: u32 = parts.get(2).and_then(|s| s.parse().ok()).unwrap_or(5);
+
+        let pattern_str = match compress {
+            &"compress" => format!("{}.{{}}.gz", path),
+            _ => format!("{}.{{}}", path),
+        };
+
+        let roller = FixedWindowRoller::builder().build(pattern_str.as_str(), keep).unwrap();
+        let trigger = SizeTrigger::new(size_mb * 1024 * 1024);
+        let policy = CompoundPolicy::new(Box::new(trigger), Box::new(roller));
+
+        let file = match RollingFileAppender::builder().encoder(Box::new(PatternEncoder::new(pattern))).build(path, Box::new(policy)) {
+            Ok(f) => f,
+            Err(e) => {
+                error!("Failed to create log file at {}: {}. Falling back to stdout.", path, e);
+                return;
+            }
+        };
+
+        let config = Log4rsConfig::builder()
+            .appender(Appender::builder().build("file", Box::new(file)))
+            .logger(Logger::builder().build("pingora_proxy", LevelFilter::Off))
+            .build(Root::builder().appender("file").build(log_level))
+            .unwrap();
+        if let Err(e) = log4rs::init_config(config) {
+            eprintln!("Warning: log4rs logger already initialized: {:?}", e);
+        }
+        info!("Logging to: {}, Max file size: {}mb, Files to keep: {}, compression: {} ", path, size_mb, keep, compress);
+    } else {
+        let stdout = ConsoleAppender::builder().encoder(Box::new(PatternEncoder::new(pattern))).build();
+        let config = Log4rsConfig::builder()
+            .appender(Appender::builder().build("stdout", Box::new(stdout)))
+            .logger(Logger::builder().build("pingora_proxy", LevelFilter::Off))
+            .build(Root::builder().appender("stdout").build(log_level))
+            .unwrap();
+        if let Err(e) = log4rs::init_config(config) {
+            eprintln!("Warning: log4rs logger already initialized: {:?}", e);
+        }
+        info!("No files are configured, logging to stdout");
+    }
+}
+
+pub async fn init_access_log(level_str: &str) {
+    let level = LogLevel::from_str(level_str);
+    let _ = ACCESS_LOG.set(level);
+}
+
+#[derive(Debug)]
+pub enum LogLevel {
+    Access,
+    Error,
+    None,
+}
+
+impl LogLevel {
+    pub fn from_str(s: &str) -> Self {
+        match s {
+            "all" => LogLevel::Access,
+            "error" => LogLevel::Error,
+            _ => LogLevel::None,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub enum MatchStatus {
+    Ok2xx,
+    Er4xx,
+    Er5xx,
+}
+
+impl MatchStatus {
+    #[inline]
+    pub fn from_code(code: u16) -> Self {
+        match code {
+            100..=399 => Self::Ok2xx,
+            400..=499 => Self::Er4xx,
+            _ => Self::Er5xx,
+        }
+    }
+}
+
+pub async fn access_log(response_code: u16, summary: &str, session: &Session) {
+    let level = ACCESS_LOG.get().unwrap_or(&LogLevel::None);
+    let status = MatchStatus::from_code(response_code);
+
+    let should_log = match level {
+        LogLevel::Access => true,
+        LogLevel::None => false,
+        LogLevel::Error => matches!(status, MatchStatus::Er5xx),
+    };
+
+    if !should_log {
+        return;
+    }
+
+    let ip = session
+        .client_addr()
+        .and_then(|addr| addr.as_inet())
+        .map(|addr| addr.ip())
+        .unwrap_or(IpAddr::V4(Ipv4Addr::LOCALHOST));
+
+    let user_agent = session.req_header().headers.get("user-agent").and_then(|v| v.to_str().ok()).unwrap_or("-");
+
+    let msg = LogMessage {
+        response_code,
+        summary: summary.to_owned(),
+        client_ip: ip,
+        version: session.req_header().version,
+        user_agent: user_agent.to_owned(),
+        cache_status: session.cache.phase(),
+    };
+
+    if IS_STRUCTURED.get().is_some() {
+        write_access_log(&msg).await;
+        return;
+    }
+    if let Some(sender) = ACCESS_LOG_SENDER.get() {
+        if let Err(_) = sender.try_send(msg) {
+            LOGGING_ERRORS.inc();
+        }
+    }
+}
+
+pub async fn init_access_logging(enabled: Option<String>) {
+    if enabled.is_some() {
+        LOGGING_ERRORS.set(0);
+        info!("Enabling {:?} log, with buffer of {} messages", ACCESS_LOG.get().unwrap_or(&LogLevel::None), LOG_BUFFER);
+        let (ltx, lrx) = mpsc::channel(LOG_BUFFER);
+        let _ = ACCESS_LOG_SENDER.set(ltx);
+        tokio::spawn(async move { access_log_receiver(lrx).await });
+    }
+}
+
+pub async fn init_structured_log() {
+    let (tx, rx) = mpsc::channel::<StructuredSystemLog>(LOG_BUFFER);
+    let _ = SYSTEM_LOG_SENDER.set(tx);
+    let backend = get_backend();
+    start_logging_backend(backend, rx);
+}
+
+pub async fn access_log_receiver(mut receiver: mpsc::Receiver<LogMessage>) {
+    while let Some(msg) = receiver.recv().await {
+        write_access_log(&msg).await;
+    }
+}
+
+async fn write_access_log(msg: &LogMessage) {
+    let level = match MatchStatus::from_code(msg.response_code) {
+        MatchStatus::Ok2xx => Level::Info,
+        MatchStatus::Er4xx => Level::Warn,
+        MatchStatus::Er5xx => Level::Error,
+    };
+    log!(
+        level,
+        "{}, {}, {}, client: {}, version: {:?}, useragent: {}",
+        msg.response_code,
+        msg.cache_status.as_str(),
+        msg.summary,
+        msg.client_ip,
+        msg.version,
+        msg.user_agent,
+    );
+}

src/logging/elasticsearch.rs

@@ -0,0 +1,187 @@
+use crate::logging::core::StructuredSystemLog;
+use crate::logging::types::{LogBackendPlugin, WriteLog};
+use crate::utils::tools::get_hostname;
+use async_trait::async_trait;
+use bytes::{BufMut, BytesMut};
+use elasticsearch::auth::Credentials;
+use elasticsearch::http::transport::Transport;
+use elasticsearch::{BulkParts, Elasticsearch};
+use humantime::format_rfc3339;
+use serde_json::json;
+use std::env;
+use std::sync::LazyLock;
+use std::time::{Duration, SystemTime};
+use tokio::sync::mpsc;
+use tokio::sync::OnceCell;
+
+static CLIENT: OnceCell<Elasticsearch> = OnceCell::const_new();
+
+#[derive(Debug)]
+struct ElasticHost {
+    url: &'static str,
+}
+
+struct ElasticSearchConfig {
+    pub hosts: &'static [ElasticHost],
+    pub user: &'static str,
+    pub password: &'static str,
+    pub hostname: &'static str,
+    pub index_name: &'static str,
+    pub flush_duration: u64,
+    pub batch_len: usize,
+    pub buffer_size: usize,
+}
+
+static ELASTIC: LazyLock<ElasticSearchConfig> = LazyLock::new(ElasticSearchConfig::load_from_env);
+
+impl ElasticSearchConfig {
+    pub fn load_from_env() -> Self {
+        let raw_hosts = env::var("LOG_ELASTIC_HOSTS").unwrap_or_else(|_| "http://127.0.0.1:9200".to_string());
+
+        let mut hosts_struct = Vec::new();
+
+        for entry in raw_hosts.split(',') {
+            let entry = entry.trim();
+            if entry.is_empty() {
+                continue;
+            }
+
+            let (scheme, rest) = if let Some(stripped) = entry.strip_prefix("https://") {
+                ("https", stripped)
+            } else if let Some(stripped) = entry.strip_prefix("http://") {
+                ("http", stripped)
+            } else {
+                ("http", entry)
+            };
+
+            let (address, port) = match rest.split_once(':') {
+                Some((host_part, port_part)) => {
+                    let port = port_part.parse::<u16>().unwrap_or(9200);
+                    (host_part, port)
+                }
+                None => (rest, 9200),
+            };
+
+            let full_url = format!("{}://{}:{}", scheme, address, port);
+
+            hosts_struct.push(ElasticHost {
+                url: Box::leak(full_url.into_boxed_str()),
+            });
+        }
+
+        let user = env::var("LOG_ELASTIC_USER").unwrap_or_else(|_| "elastic".to_string());
+        let password = env::var("LOG_ELASTIC_PASSWORD").unwrap_or_else(|_| "elastic".to_string());
+        let index_name = env::var("LOG_ELASTIC_INDEX").unwrap_or_else(|_| "aralez-logs".to_string());
+        let s_flush_duration = env::var("LOG_ELASTIC_FLUSH_DURATION").unwrap_or_else(|_| "2".to_string());
+        let flush_duration = s_flush_duration.parse::<u64>().unwrap_or(2);
+        let s_batch_len = env::var("LOG_ELASTIC_BATCH_LEN").unwrap_or_else(|_| "200".to_string());
+        let batch_len = s_batch_len.parse::<usize>().unwrap_or(200);
+        let buffer_size: usize = 100 * 512;
+
+        Self {
+            hosts: Box::leak(hosts_struct.into_boxed_slice()),
+            user: Box::leak(user.into_boxed_str()),
+            password: Box::leak(password.into_boxed_str()),
+            flush_duration,
+            batch_len,
+            buffer_size,
+            hostname: Box::leak(get_hostname().into_boxed_str()),
+            index_name: Box::leak(index_name.into_boxed_str()),
+        }
+    }
+}
+
+async fn make_es_pool() -> Elasticsearch {
+    let valid_urls: Vec<&str> = ELASTIC.hosts.iter().map(|target| target.url).collect();
+    if valid_urls.is_empty() {
+        log::error!("No valid Elasticsearch host URLs found in configuration");
+        return Elasticsearch::default();
+    }
+    let transport = match Transport::sniffing_node_list(valid_urls, Duration::from_secs(180)) {
+        Ok(t) => t,
+        Err(e) => {
+            log::error!("Failed to create sniffing transport: {}", e);
+            return Elasticsearch::default();
+        }
+    };
+    let credentials = Credentials::Basic(ELASTIC.user.to_string(), ELASTIC.password.to_string());
+    transport.set_auth(credentials);
+    let client = Elasticsearch::new(transport);
+    if let Ok(res) = client.ping().send().await {
+        if res.status_code().is_success() {
+            log::info!("Elasticsearch sniffing pool initialized successfully");
+            return client;
+        }
+    }
+    log::warn!("Elasticsearch pool initialized, but cluster ping returned non-200");
+    client
+}
+
+struct ElasticSearch;
+
+#[async_trait]
+impl WriteLog for ElasticSearch {
+    async fn run(&self, mut rx: mpsc::Receiver<StructuredSystemLog>) {
+        let mut batch = Vec::with_capacity(ELASTIC.batch_len);
+        let mut timer = tokio::time::interval(Duration::from_secs(ELASTIC.flush_duration));
+        let mut buffer = BytesMut::with_capacity(ELASTIC.buffer_size);
+        let index_header = format!("{{\"index\":{{\"_index\":\"{}\"}}}}\n", ELASTIC.index_name).into_bytes();
+
+        loop {
+            tokio::select! {
+                Some(msg) = rx.recv() => {
+                    batch.push(msg);
+                    if batch.len() >= ELASTIC.batch_len {
+                        flush_to_es(&mut batch, &mut buffer, &index_header, ELASTIC.hostname).await;
+                    }
+                }
+                _ = timer.tick() => {
+                    if !batch.is_empty() {
+                        flush_to_es(&mut batch, &mut buffer, &index_header, ELASTIC.hostname).await;
+                    }
+                }
+            }
+        }
+    }
+}
+
+async fn flush_to_es(batch: &mut Vec<StructuredSystemLog>, buffer: &mut BytesMut, index_header: &[u8], hostname: &str) {
+    buffer.clear();
+
+    for msg in batch.drain(..) {
+        buffer.extend_from_slice(index_header);
+
+        let logstash_payload = json!({
+            "@timestamp": format_rfc3339(SystemTime::now()).to_string(),
+            "@version": "1",
+            "log": {
+                "level": msg.level,
+                "logger": msg.target,
+            },
+            "message": msg.message,
+            "host": {
+                "hostname": hostname,
+            }
+        });
+
+        if serde_json::to_writer((buffer).writer(), &logstash_payload).is_ok() {
+            buffer.extend_from_slice(b"\n");
+        }
+    }
+
+    if buffer.is_empty() {
+        return;
+    }
+
+    let payload = buffer.split().freeze();
+    let client = CLIENT.get_or_init(make_es_pool).await;
+
+    let _ = client.bulk(BulkParts::None).body(vec![payload]).send().await;
+}
+
+inventory::submit! {
+    LogBackendPlugin {
+        name: "elasticsearch",
+        factory: || Box::new(ElasticSearch),
+    }
+}

src/logging/example.rs

@@ -0,0 +1,22 @@
+use crate::logging::core::StructuredSystemLog;
+use crate::logging::types::{LogBackendPlugin, WriteLog};
+use async_trait::async_trait;
+use tokio::sync::mpsc;
+
+pub struct Example;
+
+#[async_trait]
+impl WriteLog for Example {
+    async fn run(&self, mut rx: mpsc::Receiver<StructuredSystemLog>) {
+        while let Some(msg) = rx.recv().await {
+            println!("Sending log Example : {:?}", msg);
+        }
+    }
+}
+
+inventory::submit! {
+    LogBackendPlugin {
+        name: "example",
+        factory: || Box::new(Example),
+    }
+}

src/logging/mod.rs

@@ -0,0 +1,4 @@
+pub mod core;
+pub mod elasticsearch;
+pub mod example;
+pub mod types;

src/logging/types.rs

@@ -0,0 +1,36 @@
+use crate::logging::core::StructuredSystemLog;
+use async_trait::async_trait;
+use std::collections::HashMap;
+use std::sync::LazyLock;
+use tokio::sync::mpsc;
+
+#[async_trait]
+pub trait WriteLog: Send + Sync {
+    async fn run(&self, rx: mpsc::Receiver<StructuredSystemLog>);
+}
+
+pub struct LogBackendPlugin {
+    pub name: &'static str,
+    pub factory: fn() -> Box<dyn WriteLog>,
+}
+
+inventory::collect!(LogBackendPlugin);
+
+static BACKENDS: LazyLock<HashMap<&'static str, Box<dyn WriteLog>>> = LazyLock::new(|| {
+    let mut map = HashMap::new();
+    for plugin in inventory::iter::<LogBackendPlugin> {
+        map.insert(plugin.name, (plugin.factory)());
+    }
+    map
+});
+
+pub fn start_logging_backend(backend: &str, rx: mpsc::Receiver<StructuredSystemLog>) {
+    if let Some(logger) = BACKENDS.get(backend) {
+        let logger_ref = logger.as_ref();
+        tokio::spawn(async move {
+            logger_ref.run(rx).await;
+        });
+    } else {
+        log::warn!("Unsupported logging mechanism: {}", backend);
+    }
+}

src/main.rs

@@ -1,6 +1,4 @@
-mod tls;
-mod utils;
-mod web;
+use aralez::core;
 
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
@@ -12,5 +10,5 @@ fn main() {
         std::process::exit(0);
     }
 
-    web::start::run();
+    core::start::run();
 }

src/tls/acme.rs

@@ -1,2 +0,0 @@
-pub mod account;
-pub mod order;

src/tls/acme/http01.rs

@@ -1,3 +1,4 @@
+use crate::core::webserver;
 use crate::tls::acme::{account, order};
 use crate::utils::lazylock::CHALLENGES;
 use axum::body::Body;
@@ -6,7 +7,7 @@ use axum::http::{Response, StatusCode};
 use axum::response::IntoResponse;
 
 #[allow(clippy::needless_return)]
-pub async fn acme_create(State(state): State<crate::web::webserver::AppState>) -> impl IntoResponse {
+pub async fn acme_create(State(state): State<webserver::AppState>) -> impl IntoResponse {
     match account::load_or_create(state.cert_creds.as_str()).await {
         Ok(txt) => {
             return Response::builder()
@@ -24,7 +25,7 @@ pub async fn acme_create(State(state): State<crate::web::webserver::AppState>) -
     };
 }
 #[allow(clippy::needless_return)]
-pub async fn acme_order(State(state): State<crate::web::webserver::AppState>, axum::extract::Path(domain): axum::extract::Path<String>) -> impl IntoResponse {
+pub async fn acme_order(State(state): State<webserver::AppState>, axum::extract::Path(domain): axum::extract::Path<String>) -> impl IntoResponse {
     let domain_clean = domain.trim_matches('/');
     match order::order(domain_clean, state.cert_creds.as_str(), state.certs_dir).await {
         Ok(txt) => {

src/tls/acme/mod.rs

@@ -0,0 +1,6 @@
+pub mod account;
+pub mod http01;
+pub mod order;
+
+pub use account::*;
+pub use order::*;

src/tls/mod.rs

@@ -1,3 +1,4 @@
 pub mod acme;
 pub mod grades;
 pub mod load;
+pub use load::*;

src/utils/fordebug.rs

@@ -23,9 +23,9 @@ unsafe impl GlobalAlloc for CountingAllocator {
 // Uncomment following lines and comment allocator in main.rs
 // #[global_allocator]
 // pub static A: CountingAllocator = CountingAllocator;
-#[allow(dead_code)]
-fn for_example() {
-    let before = crate::utils::fordebug::ALLOC_COUNT.load(Ordering::Relaxed);
-    let after = crate::utils::fordebug::ALLOC_COUNT.load(Ordering::Relaxed);
-    println!("Allocations : {}", after - before);
-}
+// #[allow(dead_code)]
+// fn for_example() {
+//     let before = crate::utils::fordebug::ALLOC_COUNT.load(Ordering::Relaxed);
+//     let after = crate::utils::fordebug::ALLOC_COUNT.load(Ordering::Relaxed);
+//     println!("Allocations : {}", after - before);
+// }

src/utils/hcclient.rs

@@ -9,7 +9,7 @@ use std::time::Duration;
 
 pub static HC_CONNECTOR: LazyLock<Connector> = LazyLock::new(|| Connector::new(None));
 
-pub async fn httpclient(method: &str, tls: bool, host: &str, path: &str, address: &str, port: u16, url: String) -> (bool, bool) {
+pub async fn httpclient(method: &str, tls: bool, host: &str, path: &str, address: &str, port: u16, url: &str, payload: Bytes) -> (bool, bool) {
     let method = match method {
         "HEAD" => "HEAD",
         "GET" => "GET",
@@ -24,6 +24,86 @@ pub async fn httpclient(method: &str, tls: bool, host: &str, path: &str, address
         peer.options.verify_hostname = false;
     }
 
+    let mut is_h2 = false;
+    peer.options.total_connection_timeout = Option::from(Duration::from_secs(5));
+    peer.options.alpn = ALPN::H2H1;
+
+    let (mut http_session, _) = match HC_CONNECTOR.get_http_session(&peer).await {
+        Ok(s) => s,
+        Err(e) => {
+            if let Some(msg) = e.context {
+                log::warn!("{}, type: {}", msg.as_str(), e.etype.as_str());
+            } else {
+                log::warn!("Fail to connect to addr: {}, tls {}, host {}", address, tls, host);
+            }
+            return (false, false);
+        }
+    };
+
+    match http_session.as_http2() {
+        Some(_) => {
+            peer.options.alpn = ALPN::H2;
+            is_h2 = true;
+        }
+        None => {
+            if ping_grpc(url).await {
+                return (true, true);
+            }
+        }
+    }
+
+    let mut req = match RequestHeader::build(method, path.as_bytes(), None) {
+        Ok(r) => r,
+        Err(e) => {
+            log::warn!("Failed to build request: {}", e);
+            return (false, false);
+        }
+    };
+
+    req.insert_header("Host", host).ok();
+    let body_bytes = if method == "POST" {
+        req.insert_header("Content-Type", "application/json").ok();
+        req.insert_header("Content-Length", payload.len().to_string()).ok();
+        payload
+    } else {
+        Bytes::new()
+    };
+    if let Err(e) = http_session.write_request_header(Box::new(req)).await {
+        log::warn!("Write header failed: {}", e);
+        return (false, false);
+    }
+    if let Err(e) = http_session.write_request_body(body_bytes, true).await {
+        log::warn!("Write body failed: {}", e);
+        return (false, false);
+    }
+    let status = match http_session.read_response_header().await {
+        Ok(_) => http_session.response_header().map(|r| r.status.as_u16()).unwrap_or(500),
+        Err(e) => {
+            if !is_h2 && ping_grpc(url).await {
+                return (true, true);
+            }
+            log::warn!("Health Check read failed ({}) : {} - {}", if is_h2 { "H2" } else { "H1" }, host, e);
+            return (false, false);
+        }
+    };
+    HC_CONNECTOR.release_http_session(http_session, &peer, None).await;
+    ((200..500).contains(&status), is_h2)
+}
+/*
+pub async fn httpclient(method: &str, tls: bool, host: &str, path: &str, address: &str, port: u16, url: String) -> (bool, bool) {
+    let method = match method {
+        "HEAD" => "HEAD",
+        "GET" => "GET",
+        "POST" => "POST",
+        _ => "GET",
+    };
+    let mut peer = HttpPeer::new((address, port), tls, host.to_string());
+
+    if tls {
+        peer.options.verify_cert = false;
+        peer.options.verify_hostname = false;
+    }
+
     let mut is_h2 = false;
     peer.options.total_connection_timeout = Option::from(Duration::from_secs(5));
     peer.options.alpn = ALPN::H2H1;
@@ -93,3 +173,4 @@ pub async fn httpclient(method: &str, tls: bool, host: &str, path: &str, address
     HC_CONNECTOR.release_http_session(http_session, &peer, None).await;
     ((200..500).contains(&status), is_h2)
 }
+*/

src/utils/healthcheck.rs

@@ -1,7 +1,8 @@
 use crate::utils::hcclient::httpclient;
 use crate::utils::lazylock::REVERSE_STORE;
-use crate::utils::structs::{InnerMap, UpstreamsDashMap, UpstreamsIdMap};
 use crate::utils::tools::*;
+use crate::utils::types::{InnerMap, UpstreamsDashMap, UpstreamsIdMap};
+use bytes::Bytes;
 use dashmap::DashMap;
 use std::sync::atomic::AtomicUsize;
 use std::sync::Arc;
@@ -9,6 +10,7 @@ use std::time::Duration;
 use tokio::net::TcpStream;
 use tokio::time::{interval, timeout};
 use tokio_native_tls::native_tls::TlsConnector;
+const EMPTY_PAYLOAD: Bytes = Bytes::from_static(b"");
 
 pub async fn hc2(upslist: Arc<UpstreamsDashMap>, fullist: Arc<UpstreamsDashMap>, idlist: Arc<UpstreamsIdMap>, params: (&str, u64)) {
     let mut period = interval(Duration::from_secs(params.1));
@@ -66,7 +68,7 @@ async fn build_upstreams(fullist: &UpstreamsDashMap, method: &str) -> UpstreamsD
                     } else {
                         format!("http://{}:{}{}", upstream.address, upstream.port, path)
                     };
-                    let resp = httpclient(method, tls, host, path, upstream.address.as_ref(), upstream.port, link).await;
+                    let resp = httpclient(method, tls, host, path, upstream.address.as_ref(), upstream.port, link.as_str(), EMPTY_PAYLOAD).await;
                     if resp.0 {
                         if resp.1 {
                             scheme.is_http2 = resp.1;

src/utils/httpclient.rs

@@ -1,7 +1,7 @@
-use crate::utils::consul::ConsulService;
-use crate::utils::kuberconsul::match_path;
-use crate::utils::kubernetes::KubeEndpointSliceList;
-use crate::utils::structs::{GlobalServiceMapping, InnerMap};
+use crate::ingress::consul::ConsulService;
+use crate::ingress::kuberconsul::match_path;
+use crate::ingress::kubernetes::KubeEndpointSliceList;
+use crate::utils::types::{GlobalServiceMapping, InnerMap};
 use ahash::HashMap;
 use dashmap::DashMap;
 use pingora_core::connectors::http::Connector;

src/utils/metrics.rs

@@ -117,13 +117,6 @@ pub fn calc_metrics(metric_types: &MetricTypes) {
 
     REQUESTS_BY_UPSTREAM.with_label_values(&[metric_types.upstream.as_ref()]).inc();
     RESPONSE_LATENCY.observe(metric_types.latency.as_secs_f64());
-
-    // if let Some(eviction) = EVICTION.get() {
-    //     CACHE_SIZE_BYTES.set(eviction.total_size() as i64);
-    //     CACHE_ITEMS.set(eviction.total_items() as i64);
-    //     CACHE_EVICTED_BYTES.set(eviction.evicted_size() as i64);
-    //     CACHE_EVICTED_ITEMS.set(eviction.evicted_items() as i64);
-    // }
 }
 
 pub(crate) fn get_memory_usage() -> usize {

src/utils/mod.rs

@@ -1,19 +1,14 @@
-pub mod auth;
-pub mod consul;
-pub mod discovery;
-mod filewatch;
 pub mod fordebug;
 pub mod grpc;
 pub mod hcclient;
 pub mod healthcheck;
 pub mod httpclient;
-pub mod jwt;
-pub mod kuberconsul;
-pub mod kubernetes;
-pub mod kubewatcher;
+// pub mod ingress;
 pub mod lazylock;
 pub mod metrics;
 pub mod parceyaml;
 pub mod state;
-pub mod structs;
 pub mod tools;
+pub mod types;
+pub(crate) mod watch;
+pub use watch::*;

src/utils/parceyaml.rs

@@ -1,9 +1,8 @@
 use crate::utils::healthcheck;
 use crate::utils::lazylock::REVERSE_STORE;
 use crate::utils::state::{is_first_run, mark_not_first_run};
-use crate::utils::structs::*;
 use crate::utils::tools::{clone_dashmap, clone_dashmap_into, print_upstreams};
-use crate::web::logging::log_builder;
+use crate::utils::types::*;
 use dashmap::DashMap;
 use log::{error, info, warn};
 use std::collections::HashMap;
@@ -91,7 +90,7 @@ pub async fn load_configuration(d: &str, kind: &str) -> (Option<Configuration>,
             }
 
             info!("Reading upstreams from {}", d);
-            data // [2606:4700:2ff9::1]:443
+            data
         }
         "content" => {
             info!("Reading upstreams from API post body");
@@ -259,13 +258,12 @@ async fn populate_file_upstreams(config: &mut Configuration, parsed: &Config) {
     }
 }
 pub fn parce_main_config(path: &str) -> AppConfig {
-    let data = fs::read_to_string(path).unwrap();
+    let data = fs::read_to_string(path).expect("Failed to read main config file");
     let mut cfo: AppConfig = noyalib::from_str(&data).expect("Failed to parse main config file");
     if let Ok(jwt_key) = env::var("JWT_KEY") {
         cfo.master_key = Some(jwt_key);
     };
-
-    log_builder(&cfo, &cfo.log_file);
+    // log_builder(&cfo, &cfo.log_file);
     cfo.hc_method = cfo.hc_method.to_uppercase();
     if let Some((ip, port_str)) = cfo.config_address.rsplit_once(':') {
         if let Ok(port) = port_str.parse::<u16>() {

src/utils/tools.rs

@@ -1,13 +1,11 @@
 use crate::tls::load;
 use crate::tls::load::CertificateConfig;
-use crate::utils::structs::{Extraparams, InnerMapForJson, UpstreamSnapshotForJson, UpstreamsDashMap, UpstreamsIdMap};
+use crate::utils::types::{Extraparams, InnerMapForJson, UpstreamSnapshotForJson, UpstreamsDashMap, UpstreamsIdMap};
 use dashmap::DashMap;
 use log::{error, info};
-use notify::{event::ModifyKind, Config, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
 use privdrop::PrivDrop;
 use serde_json::{json, Value};
 use sha2::{Digest, Sha256};
-use std::any::type_name;
 use std::collections::{HashMap, HashSet};
 use std::fmt::Write;
 use std::fs::OpenOptions;
@@ -16,12 +14,11 @@ use std::net::SocketAddr;
 use std::net::TcpListener;
 use std::os::unix::fs::MetadataExt;
 use std::os::unix::fs::OpenOptionsExt;
+use std::process::Command;
 use std::str::FromStr;
 use std::sync::atomic::{AtomicUsize, Ordering};
-use std::sync::mpsc::{channel, Sender};
 use std::sync::Arc;
-use std::time::{Duration, Instant};
-use std::{fs, process, thread, time};
+use std::{env, fs, process, thread, time};
 
 pub fn print_upstreams(upstreams: &UpstreamsDashMap, extraparams: &Extraparams) {
     let mut out = String::new();
@@ -47,24 +44,6 @@ pub fn print_upstreams(upstreams: &UpstreamsDashMap, extraparams: &Extraparams)
     }
     info!("\n{}", out.trim_end());
 }
-#[allow(dead_code)]
-pub fn typeoff<T>(_: T) {
-    let to = type_name::<T>();
-    println!("{:?}", to);
-}
-
-#[allow(dead_code)]
-pub fn string_to_bool(val: Option<&str>) -> Option<bool> {
-    match val {
-        Some(v) => match v {
-            "yes" => Some(true),
-            "true" => Some(true),
-            _ => Some(false),
-        },
-        None => Some(false),
-    }
-}
-
 pub fn clone_dashmap(original: &UpstreamsDashMap) -> UpstreamsDashMap {
     let new_map: UpstreamsDashMap = DashMap::new();
 
@@ -209,33 +188,6 @@ pub fn listdir(dir: String) -> Vec<load::CertificateConfig> {
     certificate_configs
 }
 
-pub fn watch_folder(path: String, sender: Sender<Vec<CertificateConfig>>) -> notify::Result<()> {
-    let (tx, rx) = channel();
-    let mut watcher = RecommendedWatcher::new(tx, Config::default())?;
-    watcher.watch(path.as_ref(), RecursiveMode::Recursive)?;
-    info!("Watching for certificates in : {}", path);
-    let certificate_configs = listdir(path.clone());
-    sender.send(certificate_configs)?;
-    let mut start = Instant::now();
-    loop {
-        match rx.recv_timeout(Duration::from_secs(1)) {
-            Ok(Ok(event)) => match &event.kind {
-                EventKind::Modify(ModifyKind::Data(_)) | EventKind::Create(_) | EventKind::Remove(_) => {
-                    if start.elapsed() > Duration::from_secs(1) {
-                        start = Instant::now();
-                        let certificate_configs = listdir(path.clone());
-                        sender.send(certificate_configs)?;
-                        info!("Certificate changed: {:?}, {:?}", event.kind, event.paths);
-                    }
-                }
-                _ => {}
-            },
-            Ok(Err(e)) => error!("Watch error: {:?}", e),
-            Err(_) => {}
-        }
-    }
-}
-
 pub fn drop_priv(user: String, group: String, http_addr: String, tls_addr: Option<String>) {
     thread::sleep(time::Duration::from_millis(10));
     loop {
@@ -397,3 +349,18 @@ pub fn split_host_port(addr: &str, tls: bool) -> Option<(&str, u16, bool, &str)>
         }
     };
 }
+
+pub fn get_hostname() -> String {
+    if let Ok(host) = env::var("HOSTNAME").or_else(|_| env::var("COMPUTERNAME")) {
+        if !host.trim().is_empty() {
+            return host;
+        }
+    }
+    Command::new("hostname")
+        .output()
+        .ok()
+        .and_then(|output| String::from_utf8(output.stdout).ok())
+        .map(|s| s.trim().to_string())
+        .filter(|s| !s.is_empty())
+        .unwrap_or_else(|| "unknown".to_string())
+}

src/utils/types.rs

@@ -131,6 +131,8 @@ pub struct AppConfig {
     pub runuser: Option<String>,
     pub rungroup: Option<String>,
     pub log_file: Option<String>,
+    pub log_pattern: Option<String>,
+    pub log_structured: Option<String>,
     pub tcp_keepalive_idle: Option<u64>,
     pub tcp_keepalive_interval: Option<u64>,
     pub tcp_keepalive_count: Option<usize>,

src/utils/watch.rs

@@ -1,15 +1,18 @@
+use crate::tls::CertificateConfig;
 use crate::utils::parceyaml::load_configuration;
-use crate::utils::structs::Configuration;
-use log::error;
+use crate::utils::tools::listdir;
+use crate::utils::types::Configuration;
+use log::{error, info};
 use notify::event::ModifyKind;
 use notify::{Config, Event, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
 use pingora::prelude::sleep;
 use std::path::Path;
+use std::sync::mpsc::channel;
 use std::time::{Duration, Instant};
 use tokio::sync::mpsc::Sender;
 use tokio::task;
 
-pub async fn start(fp: String, toreturn: Sender<Configuration>) {
+pub async fn file_watch(fp: String, toreturn: Sender<Configuration>) {
     sleep(Duration::from_millis(50)).await; // For having nice logs :-)
     let file_path = fp.as_str();
     let parent_dir = Path::new(file_path).parent().unwrap();
@@ -50,3 +53,29 @@ pub async fn start(fp: String, toreturn: Sender<Configuration>) {
         }
     }
 }
+pub fn folder_watch(path: String, sender: std::sync::mpsc::Sender<Vec<CertificateConfig>>) -> notify::Result<()> {
+    let (tx, rx) = channel();
+    let mut watcher = RecommendedWatcher::new(tx, Config::default())?;
+    watcher.watch(path.as_ref(), RecursiveMode::Recursive)?;
+    info!("Watching for certificates in : {}", path);
+    let certificate_configs = listdir(path.clone());
+    sender.send(certificate_configs)?;
+    let mut start = Instant::now();
+    loop {
+        match rx.recv_timeout(Duration::from_secs(1)) {
+            Ok(Ok(event)) => match &event.kind {
+                EventKind::Modify(ModifyKind::Data(_)) | EventKind::Create(_) | EventKind::Remove(_) => {
+                    if start.elapsed() > Duration::from_secs(1) {
+                        start = Instant::now();
+                        let certificate_configs = listdir(path.clone());
+                        sender.send(certificate_configs)?;
+                        info!("Certificate changed: {:?}, {:?}", event.kind, event.paths);
+                    }
+                }
+                _ => {}
+            },
+            Ok(Err(e)) => error!("Watch error: {:?}", e),
+            Err(_) => {}
+        }
+    }
+}

src/web/logging.rs

@@ -1,176 +0,0 @@
-use crate::utils::metrics::LOGGING_ERRORS;
-use crate::utils::structs::AppConfig;
-use log::{info, LevelFilter};
-use log4rs::append::rolling_file::policy::compound::roll::fixed_window::FixedWindowRoller;
-use log4rs::append::rolling_file::policy::compound::trigger::size::SizeTrigger;
-use log4rs::append::rolling_file::policy::compound::CompoundPolicy;
-use log4rs::append::rolling_file::RollingFileAppender;
-use log4rs::{
-    append::console::ConsoleAppender,
-    config::{Appender, Config as Log4rsConfig, Root},
-    encode::pattern::PatternEncoder,
-};
-use pingora_cache::CachePhase;
-use pingora_http::Version;
-use pingora_proxy::Session;
-use std::net::{IpAddr, Ipv4Addr};
-use std::sync::OnceLock;
-use tokio::sync::mpsc;
-
-#[derive(Debug)]
-pub struct LogMessage {
-    pub response_code: u16,
-    pub summary: String,
-    pub client_ip: IpAddr,
-    pub version: Version,
-    pub user_agent: String,
-    pub cache_status: CachePhase,
-}
-static LOG_SENDER: OnceLock<mpsc::Sender<LogMessage>> = OnceLock::new();
-static ACCESS_LOG: OnceLock<LogLevel> = OnceLock::new();
-const LOG_BUFFER: usize = 16384;
-
-pub fn log_builder(conf: &AppConfig, location: &Option<String>) {
-    let log_level = match conf.log_level.as_str() {
-        "info" => LevelFilter::Info,
-        "error" => LevelFilter::Error,
-        "warn" => LevelFilter::Warn,
-        "debug" => LevelFilter::Debug,
-        "trace" => LevelFilter::Trace,
-        "off" => LevelFilter::Off,
-        _ => {
-            println!("Error reading log level, defaulting to: INFO");
-            LevelFilter::Info
-        }
-    };
-
-    let pattern = "{d(%Y-%m-%d %H:%M:%S)} {l} {t} - {m}\n";
-
-    if let Some(location) = location {
-        let parts: Vec<&str> = location.splitn(4, ',').map(|s| s.trim()).collect();
-
-        let path = parts.get(0).expect("Syntax error, could not get path for log files");
-        let compress = parts.get(3).unwrap_or(&"No");
-        let size_mb: u64 = parts.get(1).and_then(|s| s.parse().ok()).unwrap_or(100);
-        let keep: u32 = parts.get(2).and_then(|s| s.parse().ok()).unwrap_or(5);
-
-        let pattern_str = match compress {
-            &"compress" => format!("{}.{{}}.gz", path),
-            _ => format!("{}.{{}}", path),
-        };
-
-        let roller = FixedWindowRoller::builder().build(pattern_str.as_str(), keep).unwrap();
-        let trigger = SizeTrigger::new(size_mb * 1024 * 1024);
-        let policy = CompoundPolicy::new(Box::new(trigger), Box::new(roller));
-
-        let file = RollingFileAppender::builder()
-            .encoder(Box::new(PatternEncoder::new(pattern)))
-            .build(path, Box::new(policy))
-            .unwrap();
-
-        let config = Log4rsConfig::builder()
-            .appender(Appender::builder().build("file", Box::new(file)))
-            .build(Root::builder().appender("file").build(log_level))
-            .unwrap();
-        log4rs::init_config(config).unwrap();
-        info!("Logging to: {}, Max file size: {}mb, Files to keep: {}, compression: {} ", path, size_mb, keep, compress);
-    } else {
-        let stdout = ConsoleAppender::builder().encoder(Box::new(PatternEncoder::new(pattern))).build();
-
-        let config = Log4rsConfig::builder()
-            .appender(Appender::builder().build("stdout", Box::new(stdout)))
-            .build(Root::builder().appender("stdout").build(log_level))
-            .unwrap();
-        log4rs::init_config(config).unwrap();
-        info!("No files are configured, logging to stdout");
-    }
-}
-
-pub fn init_access_log(level_str: &str) {
-    let level = LogLevel::from_str(level_str);
-    let _ = ACCESS_LOG.set(level);
-}
-
-#[derive(Debug)]
-pub enum LogLevel {
-    Access,
-    Error,
-    None,
-}
-
-impl LogLevel {
-    pub fn from_str(s: &str) -> Self {
-        match s {
-            "all" => LogLevel::Access,
-            "error" => LogLevel::Error,
-            _ => LogLevel::None,
-        }
-    }
-}
-
-pub fn access_log(response_code: u16, summary: &str, session: &Session) {
-    let level = ACCESS_LOG.get().unwrap_or(&LogLevel::None);
-
-    let should_log = match level {
-        LogLevel::Access => true,
-        LogLevel::None => false,
-        LogLevel::Error => !(100..=399).contains(&response_code),
-    };
-
-    if !should_log {
-        return;
-    }
-
-    let ip = session
-        .client_addr()
-        .and_then(|addr| addr.as_inet())
-        .map(|addr| addr.ip())
-        .unwrap_or(IpAddr::V4(Ipv4Addr::LOCALHOST));
-
-    let user_agent = session.req_header().headers.get("user-agent").and_then(|v| v.to_str().ok()).unwrap_or("-");
-    // let cache_status = match session.cache.phase() {
-    //     CachePhase::Hit => "Hit",
-    //     CachePhase::Miss => "Miss",
-    //     CachePhase::Expired => "Expired",
-    //     _ => "Disabled",
-    // };
-    let log = LogMessage {
-        response_code,
-        summary: summary.to_owned(),
-        client_ip: ip,
-        version: session.req_header().version,
-        user_agent: user_agent.to_owned(),
-        cache_status: session.cache.phase(),
-    };
-
-    if let Some(sender) = LOG_SENDER.get() {
-        let sender = sender;
-        if let Err(_) = sender.try_send(log) {
-            LOGGING_ERRORS.inc();
-        }
-    }
-}
-
-pub fn init_logging(enabled: Option<String>) {
-    if let Some(_) = enabled {
-        LOGGING_ERRORS.set(0);
-        info!("Enabling {:?} log, with buffer of {} messages", ACCESS_LOG.get().unwrap_or(&LogLevel::None), LOG_BUFFER);
-        let (ltx, lrx) = mpsc::channel(LOG_BUFFER);
-        LOG_SENDER.set(ltx).unwrap();
-        std::thread::spawn(move || log_receiver(lrx));
-    }
-}
-
-pub fn log_receiver(mut receiver: mpsc::Receiver<LogMessage>) {
-    while let Some(msg) = receiver.blocking_recv() {
-        info!(
-            "{}, {}, {}, client: {}, version: {:?}, useragent: {}",
-            msg.response_code,
-            msg.cache_status.as_str(),
-            msg.summary,
-            msg.client_ip,
-            msg.version,
-            msg.user_agent,
-        );
-    }
-}