From be2d1c722b0ede35ff852092068f402f44aaa14b Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Wed, 3 Jul 2024 01:08:54 +0000 Subject: [PATCH] encap dep:chrono in time utils Signed-off-by: Jason Volk --- Cargo.lock | 2 +- src/core/Cargo.toml | 1 + src/core/utils/time.rs | 9 +++++++++ src/database/Cargo.toml | 1 - src/database/engine.rs | 7 ++----- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 05547769..d009df4b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -658,6 +658,7 @@ dependencies = [ "argon2", "axum 0.7.5", "bytes", + "chrono", "either", "figment", "hardened_malloc-rs", @@ -693,7 +694,6 @@ dependencies = [ name = "conduit_database" version = "0.4.3" dependencies = [ - "chrono", "conduit_core", "log", "ruma", diff --git a/src/core/Cargo.toml b/src/core/Cargo.toml index 76a4084e..0214762a 100644 --- a/src/core/Cargo.toml +++ b/src/core/Cargo.toml @@ -49,6 +49,7 @@ sentry_telemetry = [] argon2.workspace = true axum.workspace = true bytes.workspace = true +chrono.workspace = true either.workspace = true figment.workspace = true http-body-util.workspace = true diff --git a/src/core/utils/time.rs b/src/core/utils/time.rs index 043950a8..d7cab1fb 100644 --- a/src/core/utils/time.rs +++ b/src/core/utils/time.rs @@ -9,3 +9,12 @@ pub fn millis_since_unix_epoch() -> u64 { .expect("time is valid") .as_millis() as u64 } + +#[must_use] +pub fn rfc2822_from_seconds(epoch: i64) -> String { + use chrono::{DateTime, Utc}; + + DateTime::::from_timestamp(epoch, 0) + .unwrap_or_default() + .to_rfc2822() +} diff --git a/src/database/Cargo.toml b/src/database/Cargo.toml index f7f3c773..6e95236b 100644 --- a/src/database/Cargo.toml +++ b/src/database/Cargo.toml @@ -35,7 +35,6 @@ zstd_compression = [ ] [dependencies] -chrono.workspace = true conduit-core.workspace = true log.workspace = true ruma.workspace = true diff --git a/src/database/engine.rs b/src/database/engine.rs index 7acd470f..fe16d29f 100644 --- a/src/database/engine.rs +++ b/src/database/engine.rs @@ -4,8 +4,7 @@ use std::{ sync::{atomic::AtomicU32, Arc, Mutex, RwLock}, }; -use chrono::{DateTime, Utc}; -use conduit::{debug, error, info, warn, Result, Server}; +use conduit::{debug, error, info, utils::time::rfc2822_from_seconds, warn, Result, Server}; use rocksdb::{ backup::{BackupEngine, BackupEngineOptions}, perf::get_memory_usage_stats, @@ -211,9 +210,7 @@ impl Engine { res, "#{} {}: {} bytes, {} files", info.backup_id, - DateTime::::from_timestamp(info.timestamp, 0) - .unwrap_or_default() - .to_rfc2822(), + rfc2822_from_seconds(info.timestamp), info.size, info.num_files, )