suhoan/EasyTier
1
0
Fork 0
mirror of https://mirror.suhoan.cn/https://github.com/EasyTier/EasyTier.git synced 2025-12-14 13:47:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix local time not work in musl (#20)

Browse Source
This commit is contained in:
Sijie.Sun
2024-02-27 21:47:08 +08:00
committed by GitHub
parent e5b3fb09e6
commit 31af413b03
4 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
easytier-cli/src/main.rs
View File

@@ -366,6 +366,7 @@ fn init_logger() {
file_layer.set_ansi(false); file_layer.set_ansi(false);
let file_layer = file_layer let file_layer = file_layer
.with_writer(file_appender) .with_writer(file_appender)
.with_timer(easytier_core::common::get_logger_timer_rfc3339())
.with_filter(file_filter); .with_filter(file_filter);
tracing_subscriber::Registry::default() tracing_subscriber::Registry::default()

1
easytier-core/Cargo.toml
View File

@@ -23,6 +23,7 @@ log = "0.4"
thiserror = "1.0" thiserror = "1.0"
auto_impl = "1.1.0" auto_impl = "1.1.0"
crossbeam = "0.8.4" crossbeam = "0.8.4"
time = "0.3"
gethostname = "0.4.3" gethostname = "0.4.3"

16
easytier-core/src/common/mod.rs
View File

@@ -7,3 +7,19 @@ pub mod netns;
pub mod network; pub mod network;
pub mod rkyv_util; pub mod rkyv_util;
pub mod stun; pub mod stun;
pub fn get_logger_timer<F: time::formatting::Formattable>(
format: F,
) -> tracing_subscriber::fmt::time::OffsetTime<F> {
unsafe {
time::util::local_offset::set_soundness(time::util::local_offset::Soundness::Unsound)
};
let local_offset = time::UtcOffset::current_local_offset()
.unwrap_or(time::UtcOffset::from_whole_seconds(0).unwrap());
tracing_subscriber::fmt::time::OffsetTime::new(local_offset, format)
}
pub fn get_logger_timer_rfc3339(
) -> tracing_subscriber::fmt::time::OffsetTime<time::format_description::well_known::Rfc3339> {
get_logger_timer(time::format_description::well_known::Rfc3339)
}

5
easytier-core/src/main.rs
View File

@@ -15,6 +15,7 @@ mod peers;
mod rpc; mod rpc;
mod tunnels; mod tunnels;
use common::get_logger_timer_rfc3339;
use instance::instance::{Instance, InstanceConfigWriter}; use instance::instance::{Instance, InstanceConfigWriter};
use tracing::level_filters::LevelFilter; use tracing::level_filters::LevelFilter;
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Layer}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Layer};
@@ -53,7 +54,7 @@ fn init_logger() {
file_layer.set_ansi(false); file_layer.set_ansi(false);
let file_layer = file_layer let file_layer = file_layer
.with_writer(file_appender) .with_writer(file_appender)
.with_timer(tracing_subscriber::fmt::time::OffsetTime::local_rfc_3339().unwrap()) .with_timer(get_logger_timer_rfc3339())
.with_filter(file_filter); .with_filter(file_filter);
// logger to console // logger to console
@@ -63,7 +64,7 @@ fn init_logger() {
.unwrap(); .unwrap();
let console_layer = tracing_subscriber::fmt::layer() let console_layer = tracing_subscriber::fmt::layer()
.pretty() .pretty()
.with_timer(tracing_subscriber::fmt::time::OffsetTime::local_rfc_3339().unwrap()) .with_timer(get_logger_timer_rfc3339())
.with_writer(std::io::stderr) .with_writer(std::io::stderr)
.with_filter(console_filter); .with_filter(console_filter);