Skip to content

Commit 7dc819b

Browse files
committed
Merge branch 'main' of github.com:johnramsden/OxCache
2 parents a33edf9 + 74fa0aa commit 7dc819b

3 files changed

Lines changed: 5 additions & 11 deletions

File tree

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

oxcache/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ tracing-appender = "0.2.3"
4242
tracing = "0.1.41"
4343
chrono = "0.4.41"
4444
libc = "0.2.175"
45-
flate2 = "1.0"
4645

4746
[[test]]
4847
name = "integration_tests"

oxcache/src/main.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ use oxcache::server::{RUNTIME, Server};
66
use std::fs;
77
use std::process::exit;
88
use std::sync::OnceLock;
9-
use tracing_appender::non_blocking;
9+
use tracing_appender::{non_blocking, rolling};
1010
use tracing_subscriber::{EnvFilter, Layer, fmt, layer::SubscriberExt, util::SubscriberInitExt};
11-
use flate2::write::GzEncoder;
12-
use flate2::Compression;
1311

1412
async fn async_main() -> Result<(), Box<dyn std::error::Error>> {
1513
let cli = CliArgs::parse();
@@ -93,13 +91,11 @@ pub fn init_logging(level: &str, metrics_directory: Option<&str>) {
9391
.compact()
9492
.with_filter(EnvFilter::new(format!("{},metrics=off", directive)));
9593

96-
// Metrics in log dir - always compressed with gzip
94+
// Metrics in log dir
9795
let date = chrono::Local::now().format("%Y-%m-%d-%H-%M-%S").to_string();
98-
let filename = format!("{}/metrics-{}.json.gz", metrics_dir, date);
99-
let file = fs::File::create(&filename)
100-
.expect("Failed to create metrics file");
101-
let encoder = GzEncoder::new(file, Compression::default());
102-
let (metrics_nb, guard) = non_blocking(encoder);
96+
let filename = format!("metrics-{}.json", date);
97+
let metrics_file = rolling::never(metrics_dir, filename);
98+
let (metrics_nb, guard) = non_blocking(metrics_file);
10399
let _ = METRICS_GUARD.set(guard);
104100

105101
// JSON formatting for metrics

0 commit comments

Comments
 (0)