From 5d2e840859213bec3ef2802b4077168bae7c67b5 Mon Sep 17 00:00:00 2001 From: Jade Ellis Date: Thu, 9 Jul 2026 22:44:16 +0100 Subject: [PATCH] feat: Enable direct_tls and more logging by default Disables additional logging on maxperf builds --- .forgejo/workflows/release-image.yml | 2 ++ changelog.d/1933.misc.md | 1 + nix/packages/default.nix | 7 +++++-- src/main/Cargo.toml | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 changelog.d/1933.misc.md diff --git a/.forgejo/workflows/release-image.yml b/.forgejo/workflows/release-image.yml index a8dce34fa..ea4fd57e8 100644 --- a/.forgejo/workflows/release-image.yml +++ b/.forgejo/workflows/release-image.yml @@ -74,6 +74,7 @@ jobs: CARGO_INCREMENTAL=${{ env.BUILDKIT_ENDPOINT != '' && '1' || '0' }} TARGET_CPU= RUST_PROFILE=release + CARGO_FEATURES=default platforms: ${{ matrix.platform }} labels: ${{ steps.prepare.outputs.metadata_labels }} annotations: ${{ steps.prepare.outputs.metadata_annotations }} @@ -161,6 +162,7 @@ jobs: CARGO_INCREMENTAL=${{ env.BUILDKIT_ENDPOINT != '' && '1' || '0' }} TARGET_CPU=${{ matrix.target_cpu }} RUST_PROFILE=release-max-perf + CARGO_FEATURES=default,release_max_log_level platforms: ${{ matrix.platform }} labels: ${{ steps.prepare.outputs.metadata_labels }} annotations: ${{ steps.prepare.outputs.metadata_annotations }} diff --git a/changelog.d/1933.misc.md b/changelog.d/1933.misc.md new file mode 100644 index 000000000..0514cf206 --- /dev/null +++ b/changelog.d/1933.misc.md @@ -0,0 +1 @@ +Enable `direct_tls` and more logging by default diff --git a/nix/packages/default.nix b/nix/packages/default.nix index afc032557..823c4e681 100644 --- a/nix/packages/default.nix +++ b/nix/packages/default.nix @@ -36,14 +36,16 @@ self'.packages.stable-toolchain ); + # extra features via `cargoExtraArgs` + cargoExtraArgs = "-F http3"; + default = pkgs.callPackage ./continuwuity.nix { inherit self craneLib; liburing = (if isStatic then pkgs.pkgsStatic else pkgs).liburing; rocksdb = if isStatic then null else self'.packages.rocksdb; - # extra features via `cargoExtraArgs` - cargoExtraArgs = "-F http3"; + inherit cargoExtraArgs; # extra RUSTFLAGS via `rustflags` # the stuff below is required for http3 rustflags = "--cfg reqwest_unstable"; @@ -55,6 +57,7 @@ max-perf = default.override { # compiles slower but with more thorough optimizations profile = "release-max-perf"; + cargoExtraArgs = cargoExtraArgs + "-F release_max_log_level"; }; max-perf-haswell = max-perf.override { diff --git a/src/main/Cargo.toml b/src/main/Cargo.toml index fafaef6d8..416a1686d 100644 --- a/src/main/Cargo.toml +++ b/src/main/Cargo.toml @@ -42,12 +42,12 @@ assets = [ [features] default = [ "standard", - "release_max_log_level", "ring", "bindgen-runtime", # replace with bindgen-static on alpine ] standard = [ "brotli_compression", + "direct_tls", "element_hacks", "gzip_compression", "io_uring",