itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2026-02-15 04:09:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: replace some stray log macro invocations

Browse Source
This commit is contained in:
Austin Bonander 2026-02-04 17:03:06 -08:00
parent 853a50580c
commit c7511a3bc1
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sqlx-core/src/net/tls/tls_rustls.rs
View File

@ -219,11 +219,11 @@ fn import_root_certs() -> RootCertStore {
let load_results = rustls_native_certs::load_native_certs();
for e in load_results.errors {
log::warn!("Error loading native certificates: {e:?}");
tracing::warn!("Error loading native certificates: {e:?}");
}
for cert in load_results.certs {
if let Err(e) = root_cert_store.add(cert) {
log::warn!("rustls failed to parse native certificate: {e:?}");
tracing::warn!("rustls failed to parse native certificate: {e:?}");
}
}

2
sqlx-mysql/src/connection/establish.rs
View File

@ -46,7 +46,7 @@ impl<'a> DoHandshake<'a> {
MySqlSslMode::Disabled | MySqlSslMode::Preferred
)
{
log::warn!("Security warning: sending cleartext passwords without requiring SSL");
tracing::warn!("Security warning: sending cleartext passwords without requiring SSL");
}
Ok(Self { options })

7
sqlx-sqlite/src/regexp.rs
View File

@ -15,7 +15,6 @@
//! - <https://docs.rs/sqlx/0.6.2/sqlx/sqlite/struct.LockedSqliteHandle.html#method.as_raw_handle>
use libsqlite3_sys as ffi;
use log::error;
use regex::Regex;
use std::sync::Arc;
@ -62,7 +61,7 @@ unsafe extern "C" fn sqlite3_regexp_func(
) {
// check the arg size. sqlite3 should already ensure this is only 2 args but we want to double check
if n_arg != 2 {
eprintln!("n_arg expected to be 2, is {n_arg}");
tracing::error!("n_arg expected to be 2, is {n_arg}");
ffi::sqlite3_result_error_code(ctx, ffi::SQLITE_CONSTRAINT_FUNCTION);
return;
}
@ -117,7 +116,7 @@ unsafe fn get_regex_from_arg(
let regex = match Regex::new(value) {
Ok(regex) => Arc::new(regex),
Err(e) => {
error!("Invalid regex {value:?}: {e:?}");
tracing::error!("Invalid regex {value:?}: {e:?}");
ffi::sqlite3_result_error_code(ctx, ffi::SQLITE_CONSTRAINT_FUNCTION);
return None;
}
@ -153,7 +152,7 @@ unsafe fn get_text_from_arg<'a>(
match std::str::from_utf8(slice) {
Ok(result) => Some(result),
Err(e) => {
log::error!("Incoming text is not valid UTF8: {e:?}");
tracing::error!("Incoming text is not valid UTF8: {e:?}");
ffi::sqlite3_result_error_code(ctx, ffi::SQLITE_CONSTRAINT_FUNCTION);
None
}