itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-12-29 21:00:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat: allow log level customization (#1371)" (#1465)

Browse Source 
This reverts commit 719d80038b2f685ab52ce15bb15e953f1f162b42.
This commit is contained in:
Austin Bonander 2021-09-30 18:58:42 -07:00 committed by GitHub
parent ba3e373b7e
commit 51e45ce3ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sqlx-core/src/connection.rs
View File

@ -2,7 +2,7 @@ use crate::database::{Database, HasStatementCache};
use crate::error::Error;
use crate::transaction::Transaction;
use futures_core::future::BoxFuture;
pub use log::LevelFilter;
use log::LevelFilter;
use std::fmt::Debug;
use std::str::FromStr;
use std::time::Duration;
@ -126,16 +126,16 @@ pub trait Connection: Send {
}
#[derive(Clone, Debug)]
pub struct LogSettings {
pub statements_level: LevelFilter,
pub slow_statements_level: LevelFilter,
pub slow_statements_duration: Duration,
pub(crate) struct LogSettings {
pub(crate) statements_level: LevelFilter,
pub(crate) slow_statements_level: LevelFilter,
pub(crate) slow_statements_duration: Duration,
}
impl Default for LogSettings {
fn default() -> Self {
LogSettings {
statements_level: LevelFilter::Debug,
statements_level: LevelFilter::Info,
slow_statements_level: LevelFilter::Warn,
slow_statements_duration: Duration::from_secs(1),
}
@ -143,10 +143,10 @@ impl Default for LogSettings {
}
impl LogSettings {
pub fn log_statements(&mut self, level: LevelFilter) {
pub(crate) fn log_statements(&mut self, level: LevelFilter) {
self.statements_level = level;
}
pub fn log_slow_statements(&mut self, level: LevelFilter, duration: Duration) {
pub(crate) fn log_slow_statements(&mut self, level: LevelFilter, duration: Duration) {
self.slow_statements_level = level;
self.slow_statements_duration = duration;
}

17
sqlx-core/src/mysql/options/mod.rs
View File

@ -212,21 +212,4 @@ impl MySqlConnectOptions {
self.collation = Some(collation.to_owned());
self
}
/// Sets the log settings.
///
/// # Example
///
/// ```rust
/// # use sqlx_core::mysql::MySqlConnectOptions;
/// let options = MySqlConnectOptions::new()
/// .log_settings(sqlx_core::connection::LogSettings {
/// statements_level: sqlx_core::connection::LevelFilter::Info,
/// ..Default::default()
/// });
/// ```
pub fn log_settings(mut self, log_settings: LogSettings) -> Self {
self.log_settings = log_settings;
self
}
}

17
sqlx-core/src/postgres/options/mod.rs
View File

@ -319,23 +319,6 @@ impl PgConnectOptions {
self
}
/// Sets the log settings.
///
/// # Example
///
/// ```rust
/// # use sqlx_core::postgres::PgConnectOptions;
/// let options = PgConnectOptions::new()
/// .log_settings(sqlx_core::connection::LogSettings {
/// statements_level: sqlx_core::connection::LevelFilter::Info,
/// ..Default::default()
/// });
/// ```
pub fn log_settings(mut self, log_settings: LogSettings) -> Self {
self.log_settings = log_settings;
self
}
/// We try using a socket if hostname starts with `/` or if socket parameter
/// is specified.
pub(crate) fn fetch_socket(&self) -> Option<String> {

17
sqlx-core/src/sqlite/options/mod.rs
View File

@ -234,21 +234,4 @@ impl SqliteConnectOptions {
self.immutable = immutable;
self
}
/// Sets the log settings.
///
/// # Example
///
/// ```rust
/// # use sqlx_core::sqlite::SqliteConnectOptions;
/// let options = SqliteConnectOptions::new()
/// .log_settings(sqlx_core::connection::LogSettings {
/// statements_level: sqlx_core::connection::LevelFilter::Info,
/// ..Default::default()
/// });
/// ```
pub fn log_settings(mut self, log_settings: LogSettings) -> Self {
self.log_settings = log_settings;
self
}
}