From 60ee891f734910e4c07866b2e3534ec2d92f7558 Mon Sep 17 00:00:00 2001 From: Aleks Todorov Date: Mon, 19 Feb 2024 20:09:55 +0000 Subject: [PATCH] Improve logging Switch from SQLx logging to SeaORM logging which is clearer. --- backend-rs/streamfox/Cargo.toml | 2 +- backend-rs/streamfox/src/main.rs | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/backend-rs/streamfox/Cargo.toml b/backend-rs/streamfox/Cargo.toml index 2ed0b0d..a5a54f0 100644 --- a/backend-rs/streamfox/Cargo.toml +++ b/backend-rs/streamfox/Cargo.toml @@ -17,7 +17,7 @@ fs-file = { version = "0.0.0", path = "../fs-file", default-features = false } jsonwebtoken = { version = "9.2.0", default-features = false } lazy_static = "1.4.0" ring = "0.17.7" -sea-orm = { version = "0.12.14", features = ["runtime-tokio-rustls", "sqlx-postgres"] } +sea-orm = { version = "0.12.14", features = ["runtime-tokio-rustls", "sqlx-postgres", "debug-print"] } sea-orm-migration = "0.12.12" serde = { version = "1.0.196", features = ["derive"] } serde_json = "1.0.113" diff --git a/backend-rs/streamfox/src/main.rs b/backend-rs/streamfox/src/main.rs index da23e7f..d011f1b 100644 --- a/backend-rs/streamfox/src/main.rs +++ b/backend-rs/streamfox/src/main.rs @@ -12,7 +12,7 @@ use crate::snowflake::SnowflakeGenerator; use axum::{routing, Router}; use cascade::cascade; use fs::filesystem; -use sea_orm::{Database, DatabaseConnection, DbErr}; +use sea_orm::{ConnectOptions, Database, DatabaseConnection, DbErr}; use sea_orm_migration::MigratorTrait; use std::io; use std::net::SocketAddr; @@ -70,11 +70,15 @@ async fn main() -> Result<(), AppError> { tracing_subscriber::fmt() .with_target(false) .compact() + .with_max_level(tracing::Level::DEBUG) .init(); - let connection = Database::connect(&config.database.connection_string()) - .await - .map_err(AppError::ConnectToDatabase)?; + let connection = Database::connect(cascade! { + ConnectOptions::new(config.database.connection_string()); + ..sqlx_logging(false); + }) + .await + .map_err(AppError::ConnectToDatabase)?; Migrator::up(&connection, None) .await .map_err(AppError::MigrateDatabase)?;