magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: add tracing-log patch, use pinned tracing revs

Browse source 
original patch from 637ff3ce0c (diff-73188cdc15fe4e672c637dfc8a06ca08c30f789aa31dc8e1a5297f76779bc369)

Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
PedroHLC 2024-06-15 21:27:12 -04:00 • committed by strawberry
parent cd3e7394bf
commit 2be2a0dc91
2 changed files with 13 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Cargo.lock generated
View file

@ -4401,7 +4401,7 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
[[package]] [[package]]
name = "tracing" name = "tracing"
version = "0.1.40" 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 = [ dependencies = [
"log", "log",
"pin-project-lite", "pin-project-lite",
@ -4412,7 +4412,7 @@ dependencies = [
[[package]] [[package]]
name = "tracing-attributes" name = "tracing-attributes"
version = "0.1.27" 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 = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -4422,7 +4422,7 @@ dependencies = [
[[package]] [[package]]
name = "tracing-core" name = "tracing-core"
version = "0.1.32" 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 = [ dependencies = [
"once_cell", "once_cell",
"valuable", "valuable",
@ -4442,18 +4442,7 @@ dependencies = [
[[package]] [[package]]
name = "tracing-log" name = "tracing-log"
version = "0.2.0" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/girlbossceo/tracing?rev=b348dca742af641c47bc390261f60711c2af573c#b348dca742af641c47bc390261f60711c2af573c"
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"
dependencies = [ dependencies = [
"log", "log",
"once_cell", "once_cell",
@ -4473,7 +4462,7 @@ dependencies = [
"smallvec", "smallvec",
"tracing", "tracing",
"tracing-core", "tracing-core",
"tracing-log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "tracing-log",
"tracing-subscriber", "tracing-subscriber",
"web-time 0.2.4", "web-time 0.2.4",
] ]
@ -4481,7 +4470,7 @@ dependencies = [
[[package]] [[package]]
name = "tracing-subscriber" name = "tracing-subscriber"
version = "0.3.18" 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 = [ dependencies = [
"matchers", "matchers",
"nu-ansi-term", "nu-ansi-term",
@ -4492,7 +4481,7 @@ dependencies = [
"thread_local", "thread_local",
"tracing", "tracing",
"tracing-core", "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]] [[package]]

9
Cargo.toml
View file

@ -429,13 +429,16 @@ version = "0.29.2"
# we can switch back to upstream if #2956 is merged and backported in the upstream repo. # we can switch back to upstream if #2956 is merged and backported in the upstream repo.
[patch.crates-io.tracing-subscriber] [patch.crates-io.tracing-subscriber]
git = "https://github.com/girlbossceo/tracing" git = "https://github.com/girlbossceo/tracing"
branch = "tracing-subscriber/env-filter-clone-0.1.x-backport" rev = "b348dca742af641c47bc390261f60711c2af573c"
[patch.crates-io.tracing] [patch.crates-io.tracing]
git = "https://github.com/girlbossceo/tracing" git = "https://github.com/girlbossceo/tracing"
branch = "tracing-subscriber/env-filter-clone-0.1.x-backport" rev = "b348dca742af641c47bc390261f60711c2af573c"
[patch.crates-io.tracing-core] [patch.crates-io.tracing-core]
git = "https://github.com/girlbossceo/tracing" 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] # fixes hyper graceful shutdowns [https://github.com/programatik29/axum-server/issues/114]
[patch.crates-io.axum-server] [patch.crates-io.axum-server]