From 2be2a0dc914ba65b970b4c44e0468bf8084eee8a Mon Sep 17 00:00:00 2001 From: PedroHLC Date: Sat, 15 Jun 2024 21:27:12 -0400 Subject: [PATCH] fix: add tracing-log patch, use pinned tracing revs original patch from https://github.com/chaotic-cx/nyx/commit/637ff3ce0c8c19673d5f06d31c18a61db9d84459#diff-73188cdc15fe4e672c637dfc8a06ca08c30f789aa31dc8e1a5297f76779bc369 Signed-off-by: strawberry --- Cargo.lock | 25 +++++++------------------ Cargo.toml | 9 ++++++--- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 07148055..d4cc7b8c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4401,7 +4401,7 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" version = "0.1.40" -source = "git+https://github.com/girlbossceo/tracing?branch=tracing-subscriber/env-filter-clone-0.1.x-backport#b348dca742af641c47bc390261f60711c2af573c" +source = "git+https://github.com/girlbossceo/tracing?rev=b348dca742af641c47bc390261f60711c2af573c#b348dca742af641c47bc390261f60711c2af573c" dependencies = [ "log", "pin-project-lite", @@ -4412,7 +4412,7 @@ dependencies = [ [[package]] name = "tracing-attributes" version = "0.1.27" -source = "git+https://github.com/girlbossceo/tracing?branch=tracing-subscriber/env-filter-clone-0.1.x-backport#b348dca742af641c47bc390261f60711c2af573c" +source = "git+https://github.com/girlbossceo/tracing?rev=b348dca742af641c47bc390261f60711c2af573c#b348dca742af641c47bc390261f60711c2af573c" dependencies = [ "proc-macro2", "quote", @@ -4422,7 +4422,7 @@ dependencies = [ [[package]] name = "tracing-core" version = "0.1.32" -source = "git+https://github.com/girlbossceo/tracing?branch=tracing-subscriber/env-filter-clone-0.1.x-backport#b348dca742af641c47bc390261f60711c2af573c" +source = "git+https://github.com/girlbossceo/tracing?rev=b348dca742af641c47bc390261f60711c2af573c#b348dca742af641c47bc390261f60711c2af573c" dependencies = [ "once_cell", "valuable", @@ -4442,18 +4442,7 @@ dependencies = [ [[package]] name = "tracing-log" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "git+https://github.com/girlbossceo/tracing?branch=tracing-subscriber/env-filter-clone-0.1.x-backport#b348dca742af641c47bc390261f60711c2af573c" +source = "git+https://github.com/girlbossceo/tracing?rev=b348dca742af641c47bc390261f60711c2af573c#b348dca742af641c47bc390261f60711c2af573c" dependencies = [ "log", "once_cell", @@ -4473,7 +4462,7 @@ dependencies = [ "smallvec", "tracing", "tracing-core", - "tracing-log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing-log", "tracing-subscriber", "web-time 0.2.4", ] @@ -4481,7 +4470,7 @@ dependencies = [ [[package]] name = "tracing-subscriber" version = "0.3.18" -source = "git+https://github.com/girlbossceo/tracing?branch=tracing-subscriber/env-filter-clone-0.1.x-backport#b348dca742af641c47bc390261f60711c2af573c" +source = "git+https://github.com/girlbossceo/tracing?rev=b348dca742af641c47bc390261f60711c2af573c#b348dca742af641c47bc390261f60711c2af573c" dependencies = [ "matchers", "nu-ansi-term", @@ -4492,7 +4481,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log 0.2.0 (git+https://github.com/girlbossceo/tracing?branch=tracing-subscriber/env-filter-clone-0.1.x-backport)", + "tracing-log", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index da0c06fe..b7994847 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -429,13 +429,16 @@ version = "0.29.2" # we can switch back to upstream if #2956 is merged and backported in the upstream repo. [patch.crates-io.tracing-subscriber] git = "https://github.com/girlbossceo/tracing" -branch = "tracing-subscriber/env-filter-clone-0.1.x-backport" +rev = "b348dca742af641c47bc390261f60711c2af573c" [patch.crates-io.tracing] git = "https://github.com/girlbossceo/tracing" -branch = "tracing-subscriber/env-filter-clone-0.1.x-backport" +rev = "b348dca742af641c47bc390261f60711c2af573c" [patch.crates-io.tracing-core] git = "https://github.com/girlbossceo/tracing" -branch = "tracing-subscriber/env-filter-clone-0.1.x-backport" +rev = "b348dca742af641c47bc390261f60711c2af573c" +[patch.crates-io.tracing-log] +git = "https://github.com/girlbossceo/tracing" +rev = "b348dca742af641c47bc390261f60711c2af573c" # fixes hyper graceful shutdowns [https://github.com/programatik29/axum-server/issues/114] [patch.crates-io.axum-server]