From 43c07636d8ee6114e1df19bc9f78410bef92ffbc Mon Sep 17 00:00:00 2001 From: binarybaron Date: Mon, 27 Dec 2021 15:29:13 +0100 Subject: [PATCH] Revert move from `chrono` to `local-time` This reverts commit 9e85637419594f69d05e0d03767d66b07001a0ae --- CHANGELOG.md | 1 - Cargo.lock | 44 ++++++++--------------------------------- swap/Cargo.toml | 4 ++-- swap/src/asb/tracing.rs | 5 ++--- swap/src/cli/tracing.rs | 13 ++++++------ swap/src/tracing_ext.rs | 2 +- 6 files changed, 19 insertions(+), 50 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2638a82..0bfc696d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 This is a breaking database change! Swaps that were saved prior to this change may fail to load if they are in state `SwapSetupCompleted` of `BtcLocked`. Make sure to finish your swaps before upgrading. -- logs to use rfc3339 local time formatting. ## [0.10.1] - 2021-12-23 diff --git a/Cargo.lock b/Cargo.lock index a50779dc..f2dd135e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2124,15 +2124,6 @@ dependencies = [ "regex-automata", ] -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata", -] - [[package]] name = "matches" version = "0.1.8" @@ -2246,7 +2237,7 @@ dependencies = [ "testcontainers 0.12.0", "tokio", "tracing", - "tracing-subscriber 0.2.25", + "tracing-subscriber", ] [[package]] @@ -2280,7 +2271,7 @@ dependencies = [ "rand 0.7.3", "testcontainers 0.12.0", "tokio", - "tracing-subscriber 0.2.25", + "tracing-subscriber", ] [[package]] @@ -4029,7 +4020,7 @@ dependencies = [ "tracing", "tracing-appender", "tracing-futures", - "tracing-subscriber 0.3.3", + "tracing-subscriber", "url", "uuid", "vergen", @@ -4169,7 +4160,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cde1cf55178e0293453ba2cca0d5f8392a922e52aa958aee9c28ed02becc6d03" dependencies = [ - "itoa", "libc", ] @@ -4366,13 +4356,13 @@ dependencies = [ [[package]] name = "tracing-appender" -version = "0.2.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94571df2eae3ed4353815ea5a90974a594a1792d8782ff2cbcc9392d1101f366" +checksum = "9965507e507f12c8901432a33e31131222abac31edd90cabbcf85cf544b7127a" dependencies = [ + "chrono", "crossbeam-channel", - "time 0.3.3", - "tracing-subscriber 0.3.3", + "tracing-subscriber", ] [[package]] @@ -4437,30 +4427,12 @@ dependencies = [ "ansi_term 0.12.1", "chrono", "lazy_static", - "matchers 0.0.1", - "regex", - "sharded-slab", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245da694cc7fc4729f3f418b304cb57789f1bed2a78c575407ab8a23f53cb4d3" -dependencies = [ - "ansi_term 0.12.1", - "lazy_static", - "matchers 0.1.0", + "matchers", "regex", "serde", "serde_json", "sharded-slab", "thread_local", - "time 0.3.3", "tracing", "tracing-core", "tracing-log", diff --git a/swap/Cargo.toml b/swap/Cargo.toml index 446d2281..151cff7a 100644 --- a/swap/Cargo.toml +++ b/swap/Cargo.toml @@ -60,9 +60,9 @@ tokio-util = { version = "0.6", features = [ "io" ] } toml = "0.5" torut = { version = "0.2", default-features = false, features = [ "v3", "control" ] } tracing = { version = "0.1", features = [ "attributes" ] } -tracing-appender = "0.2" +tracing-appender = "0.1" tracing-futures = { version = "0.2", features = [ "std-future", "futures-03" ] } -tracing-subscriber = { version = "0.3", default-features = false, features = [ "fmt", "ansi", "env-filter", "local-time", "tracing-log", "json" ] } +tracing-subscriber = { version = "0.2", default-features = false, features = [ "fmt", "ansi", "env-filter", "chrono", "tracing-log", "json" ] } url = { version = "2", features = [ "serde" ] } uuid = { version = "0.8", features = [ "serde", "v4" ] } void = "1" diff --git a/swap/src/asb/tracing.rs b/swap/src/asb/tracing.rs index 4119a84d..dc3f7cca 100644 --- a/swap/src/asb/tracing.rs +++ b/swap/src/asb/tracing.rs @@ -1,7 +1,6 @@ use anyhow::Result; -use time::format_description::well_known::Rfc3339; use tracing_subscriber::filter::LevelFilter; -use tracing_subscriber::fmt::time::LocalTime; +use tracing_subscriber::fmt::time::ChronoLocal; use tracing_subscriber::FmtSubscriber; pub fn init(level: LevelFilter, json_format: bool, timestamp: bool) -> Result<()> { @@ -15,7 +14,7 @@ pub fn init(level: LevelFilter, json_format: bool, timestamp: bool) -> Result<() .with_env_filter(format!("asb={},swap={}", level, level)) .with_writer(std::io::stderr) .with_ansi(is_terminal) - .with_timer(LocalTime::new(Rfc3339)) + .with_timer(ChronoLocal::with_format("%F %T".to_owned())) .with_target(false); match (json_format, timestamp) { diff --git a/swap/src/cli/tracing.rs b/swap/src/cli/tracing.rs index 912513c3..5ed58231 100644 --- a/swap/src/cli/tracing.rs +++ b/swap/src/cli/tracing.rs @@ -1,11 +1,10 @@ use anyhow::Result; use std::option::Option::Some; use std::path::Path; -use time::format_description::well_known::Rfc3339; use tracing::subscriber::set_global_default; use tracing::{Event, Level, Subscriber}; use tracing_subscriber::fmt::format::{DefaultFields, Format, JsonFields}; -use tracing_subscriber::fmt::time::LocalTime; +use tracing_subscriber::fmt::time::ChronoLocal; use tracing_subscriber::layer::{Context, SubscriberExt}; use tracing_subscriber::{fmt, EnvFilter, FmtSubscriber, Layer, Registry}; use uuid::Uuid; @@ -53,7 +52,7 @@ pub fn init(debug: bool, json: bool, dir: impl AsRef, swap_id: Option = tracing_subscriber::fmt::Layer< fn() -> std::io::Stderr, >; -fn debug_terminal_printer() -> StdErrPrinter>> { +fn debug_terminal_printer() -> StdErrPrinter> { let is_terminal = atty::is(atty::Stream::Stderr); StdErrPrinter { inner: fmt::layer() .with_ansi(is_terminal) .with_target(false) - .with_timer(LocalTime::new(Rfc3339)) + .with_timer(ChronoLocal::with_format("%F %T".to_owned())) .with_writer(std::io::stderr), level: Level::DEBUG, } } -fn debug_json_terminal_printer() -> StdErrPrinter>> { +fn debug_json_terminal_printer() -> StdErrPrinter> { let is_terminal = atty::is(atty::Stream::Stderr); StdErrPrinter { inner: fmt::layer() .with_ansi(is_terminal) .with_target(false) - .with_timer(LocalTime::new(Rfc3339)) + .with_timer(ChronoLocal::with_format("%F %T".to_owned())) .json() .with_writer(std::io::stderr), level: Level::DEBUG, diff --git a/swap/src/tracing_ext.rs b/swap/src/tracing_ext.rs index 3bb64f6d..912187fd 100644 --- a/swap/src/tracing_ext.rs +++ b/swap/src/tracing_ext.rs @@ -41,7 +41,7 @@ impl MakeCapturingWriter { } } -impl MakeWriter<'_> for MakeCapturingWriter { +impl MakeWriter for MakeCapturingWriter { type Writer = CapturingWriter; fn make_writer(&self) -> Self::Writer {