Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-08-10 23:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert move from chrono to local-time

Browse source 
This reverts commit 9e85637419
This commit is contained in:
binarybaron 2021-12-27 15:29:13 +01:00
parent 3ce4dffb84
commit 43c07636d8
6 changed files with 19 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

13
swap/src/cli/tracing.rs
View file

@ -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<Path>, swap_id: Option<Uuid
.with_env_filter(format!("swap={}", 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);
if json {
@ -85,25 +84,25 @@ type StdErrJsonLayer<S, T> = tracing_subscriber::fmt::Layer<
fn() -> std::io::Stderr,
>;
fn debug_terminal_printer<S>() -> StdErrPrinter<StdErrLayer<S, LocalTime<Rfc3339>>> {
fn debug_terminal_printer<S>() -> StdErrPrinter<StdErrLayer<S, ChronoLocal>> {
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<S>() -> StdErrPrinter<StdErrJsonLayer<S, LocalTime<Rfc3339>>> {
fn debug_json_terminal_printer<S>() -> StdErrPrinter<StdErrJsonLayer<S, ChronoLocal>> {
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,