From ff381518370c933a01a08bc71b06f610070654a4 Mon Sep 17 00:00:00 2001 From: MedzikUser Date: Tue, 12 Jul 2022 11:11:51 +0200 Subject: [PATCH] chore(database): change log level from `info` to `debug` --- Cargo.lock | 2 +- core/Cargo.toml | 2 +- core/src/logger.rs | 11 +++++++++++ database/Cargo.toml | 2 +- database/src/sqlite.rs | 14 +++++++++++--- 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 00d04fe..9a2ef67 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -684,9 +684,9 @@ version = "0.0.0" dependencies = [ "futures-util", "homedisk-types", - "log", "sqlx", "tokio", + "tracing", "uuid", ] diff --git a/core/Cargo.toml b/core/Cargo.toml index 6e07df9..c575954 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -15,7 +15,7 @@ path = "./src/main.rs" anyhow = "1.0.58" better-panic = "0.3.0" tracing-subscriber = "0.3.14" -tracing = { version = "0.1.35", features = ["max_level_debug", "release_max_level_warn"] } +tracing = { version = "0.1.35", features = ["max_level_debug", "release_max_level_info"] } tokio = { version = "1.19.2", features = ["rt-multi-thread", "macros"] } homedisk-database = { path = "../database" } homedisk-server = { path = "../server" } diff --git a/core/src/logger.rs b/core/src/logger.rs index c9408bb..9292b74 100644 --- a/core/src/logger.rs +++ b/core/src/logger.rs @@ -1,8 +1,19 @@ +use tracing::level_filters::LevelFilter; + +/// Max Logger Level on debug build +#[cfg(debug_assertions)] +const MAX_LEVEL: LevelFilter = LevelFilter::DEBUG; + +/// Max Logger Level on release build +#[cfg(not(debug_assertions))] +const MAX_LEVEL: LevelFilter = LevelFilter::INFO; + pub fn init() { // initialize better_panic better_panic::install(); // initialize tracing tracing_subscriber::fmt() + .with_max_level(MAX_LEVEL) .init(); } diff --git a/database/Cargo.toml b/database/Cargo.toml index 8a32547..4631a67 100644 --- a/database/Cargo.toml +++ b/database/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" edition = "2021" [dependencies] -log = "0.4.17" +tracing = "0.1.35" futures-util = "0.3.21" sqlx = { version = "0.6.0", features = ["runtime-tokio-rustls", "sqlite"] } uuid = { version = "1.1.2", features = ["v5"] } diff --git a/database/src/sqlite.rs b/database/src/sqlite.rs index a89043b..b0c95f2 100644 --- a/database/src/sqlite.rs +++ b/database/src/sqlite.rs @@ -1,6 +1,8 @@ +use std::str::FromStr; + use futures_util::TryStreamExt; -use log::debug; -use sqlx::{sqlite::SqliteQueryResult, Executor, Row, SqlitePool}; +use sqlx::{sqlite::{SqliteQueryResult, SqliteConnectOptions}, Executor, Row, SqlitePool, ConnectOptions}; +use tracing::{log::LevelFilter, debug}; use super::{Error, Result, User}; @@ -28,8 +30,14 @@ impl Database { pub async fn open(path: &str) -> Result { debug!("Opening SQLite database"); + // sqlite connection options + let mut options = SqliteConnectOptions::from_str(path)?; + + // set log level to Debug + options.log_statements(LevelFilter::Debug); + // create a database pool - let conn = SqlitePool::connect(path).await?; + let conn = SqlitePool::connect_with(options.clone()).await?; // return `Database` Ok(Self { conn })