caisin/sea-orm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sqlx logging configurable for seaorm-rocket (#1192)

Browse Source
This commit is contained in:
Jakob 2022-11-06 05:03:07 +01:00 committed by GitHub
parent 9dfc481c3b
commit 9952aa6740
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/rocket_example/api/src/pool.rs
View File

@ -26,7 +26,8 @@ impl sea_orm_rocket::Pool for SeaOrmPool {
options options
.max_connections(config.max_connections as u32) .max_connections(config.max_connections as u32)
.min_connections(config.min_connections.unwrap_or_default()) .min_connections(config.min_connections.unwrap_or_default())
.connect_timeout(Duration::from_secs(config.connect_timeout)); .connect_timeout(Duration::from_secs(config.connect_timeout))
.sqlx_logging(config.sqlx_logging);
if let Some(idle_timeout) = config.idle_timeout { if let Some(idle_timeout) = config.idle_timeout {
options.idle_timeout(Duration::from_secs(idle_timeout)); options.idle_timeout(Duration::from_secs(idle_timeout));
} }

4
sea-orm-rocket/lib/src/config.rs
View File

@ -37,6 +37,7 @@ use rocket::serde::{Deserialize, Serialize};
/// max_connections: 1024, /// max_connections: 1024,
/// connect_timeout: 3, /// connect_timeout: 3,
/// idle_timeout: None, /// idle_timeout: None,
/// sqlx_logging: true,
/// }, /// },
/// )); /// ));
/// ///
@ -82,4 +83,7 @@ pub struct Config {
/// ///
/// _Default:_ `None`. /// _Default:_ `None`.
pub idle_timeout: Option<u64>, pub idle_timeout: Option<u64>,
/// Enable SQLx statement logging (default true)
pub sqlx_logging: bool,
} }

3
sea-orm-rocket/lib/src/database.rs
View File

@ -241,7 +241,8 @@ impl<D: Database> Fairing for Initializer<D> {
.figment() .figment()
.focus(&format!("databases.{}", D::NAME)) .focus(&format!("databases.{}", D::NAME))
.merge(Serialized::default("max_connections", workers * 4)) .merge(Serialized::default("max_connections", workers * 4))
.merge(Serialized::default("connect_timeout", 5)); .merge(Serialized::default("connect_timeout", 5))
.merge(Serialized::default("sqlx_logging", true));
match <D::Pool>::init(&figment).await { match <D::Pool>::init(&figment).await {
Ok(pool) => Ok(rocket.manage(D::from(pool))), Ok(pool) => Ok(rocket.manage(D::from(pool))),