Skip to content

Commit c760728

Browse files
committed
chore: formatting
1 parent 1941759 commit c760728

7 files changed

Lines changed: 11 additions & 10 deletions

File tree

examples/import_csv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use metrics_sqlite::MetricsDb;
2-
use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
2+
use tracing_subscriber::{EnvFilter, fmt, layer::SubscriberExt, util::SubscriberInitExt};
33

44
fn main() {
55
let fmt_layer = fmt::layer();

examples/large-file.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use metrics::{counter, gauge};
22
use metrics_sqlite::SqliteExporter;
33
use std::time::Duration;
44
use tracing_subscriber::prelude::*;
5-
use tracing_subscriber::{fmt, EnvFilter};
5+
use tracing_subscriber::{EnvFilter, fmt};
66

77
fn setup_metrics() {
88
let exporter = SqliteExporter::new(

examples/simple.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use metrics::{counter, gauge};
22
use metrics_sqlite::SqliteExporter;
33
use std::time::Duration;
4-
use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
4+
use tracing_subscriber::{EnvFilter, fmt, layer::SubscriberExt, util::SubscriberInitExt};
55

66
fn setup_metrics() {
77
let exporter = SqliteExporter::new(

examples/summary.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::time::Duration;
33
use chrono::{DateTime, Local, TimeZone};
44
use clap::Parser;
55
use metrics_sqlite::MetricsDb;
6-
use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
6+
use tracing_subscriber::{EnvFilter, fmt, layer::SubscriberExt, util::SubscriberInitExt};
77

88
#[derive(Parser)]
99
struct Args {

src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -585,11 +585,11 @@ impl SqliteExporter {
585585
let excess = records - record_limit + (record_limit / 4); // delete excess + 25% of limit
586586
trace!(
587587
"Exceeded limit! {} > {}, deleting {} oldest",
588-
records,
589-
record_limit,
590-
excess
588+
records, record_limit, excess
589+
);
590+
let query = format!(
591+
"DELETE FROM metrics WHERE id IN (SELECT id FROM metrics ORDER BY timestamp ASC LIMIT {excess});"
591592
);
592-
let query = format!("DELETE FROM metrics WHERE id IN (SELECT id FROM metrics ORDER BY timestamp ASC LIMIT {excess});");
593593
if let Err(e) = sql_query(query).execute(db) {
594594
error!("Failed to delete excessive records: {:?}", e);
595595
}

src/metrics_db.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
//! Metrics DB, to use/query/etc metrics SQLite databases
22
use super::{
3+
MetricsError, Result,
34
models::{Metric, MetricKey},
4-
setup_db, MetricsError, Result,
5+
setup_db,
56
};
67
use diesel::prelude::*;
78
#[cfg(feature = "import_csv")]

src/recorder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use metrics::{
44
Recorder, SharedString, Unit,
55
};
66
use std::{
7-
sync::{mpsc::SyncSender, Arc},
7+
sync::{Arc, mpsc::SyncSender},
88
time::SystemTime,
99
};
1010
use tracing::error;

0 commit comments

Comments
 (0)