database: log queries at the trace level (#105)

Author: emilyalbini

Cargo.toml

@@ -95,7 +95,7 @@ serde_urlencoded = "0.7"
 serde_with = "3"
 serde_yaml = "0.9"
 sigpipe = "0.1"
-slog = { version = "2.7", features = [ "release_max_level_debug" ] }
+slog = { version = "2.7", features = [ "release_max_level_trace", "max_level_trace" ] }
 slog-bunyan = "2.4"
 slog-term = "2.7"
 smf = { git = "https://github.com/illumos/smf-rs.git" }

common/src/lib.rs

@@ -27,12 +27,12 @@ where
 }
 
 pub fn make_log(name: &'static str) -> Logger {
-    let filter_level = match std::env::var("BUILDOMAT_DEBUG")
-        .map(|v| v.to_ascii_lowercase())
-        .as_deref()
-    {
-        Ok("yes") | Ok("1") | Ok("true") => slog::Level::Debug,
-        _ => slog::Level::Info,
+    let filter_level = if bool_env("BUILDOMAT_TRACE") {
+        slog::Level::Trace
+    } else if bool_env("BUILDOMAT_DEBUG") {
+        slog::Level::Debug
+    } else {
+        slog::Level::Info
     };
 
     if std::io::stdout().is_terminal() {
@@ -61,6 +61,15 @@ pub fn make_log(name: &'static str) -> Logger {
     }
 }
 
+fn bool_env(var: &str) -> bool {
+    if let Ok(content) = std::env::var(var) {
+        let lower = content.to_ascii_lowercase();
+        lower == "1" || lower == "yes" || lower == "true"
+    } else {
+        false
+    }
+}
+
 pub async fn sleep_ms(ms: u64) {
     tokio::time::sleep(Duration::from_millis(ms)).await;
 }

database/src/lib.rs

@@ -16,7 +16,7 @@ use sea_query::{
     SelectStatement, SqliteQueryBuilder, UpdateStatement, Value,
 };
 use sea_query_rusqlite::{RusqliteBinder, RusqliteValues};
-use slog::{debug, Logger};
+use slog::{trace, Logger};
 use thiserror::Error;
 
 #[usdt::provider]
@@ -622,7 +622,7 @@ impl<'a> Handle<'a> {
         s: SelectStatement,
     ) -> DBResult<Option<T>> {
         let (q, v) = s.build_rusqlite(SqliteQueryBuilder);
-        debug!(self.log, "query: {q}"; "sql" => true);
+        trace!(self.log, "query: {q}"; "sql" => true);
 
         sql__query__start!(|| &q);
         let mut s = self.tx.prepare(&q)?;
@@ -639,7 +639,7 @@ impl<'a> Handle<'a> {
 
     pub fn get_strings(&mut self, s: SelectStatement) -> DBResult<Vec<String>> {
         let (q, v) = s.build_rusqlite(SqliteQueryBuilder);
-        debug!(self.log, "query: {q}"; "sql" => true);
+        trace!(self.log, "query: {q}"; "sql" => true);
 
         sql__query__start!(|| &q);
         let mut s = self.tx.prepare(&q)?;
@@ -655,7 +655,7 @@ impl<'a> Handle<'a> {
         s: SelectStatement,
     ) -> DBResult<Vec<T>> {
         let (q, v) = s.build_rusqlite(SqliteQueryBuilder);
-        debug!(self.log, "query: {q}"; "sql" => true);
+        trace!(self.log, "query: {q}"; "sql" => true);
 
         sql__query__start!(|| &q);
         let mut s = self.tx.prepare(&q)?;
@@ -668,7 +668,7 @@ impl<'a> Handle<'a> {
 
     pub fn get_row<T: FromRow>(&mut self, s: SelectStatement) -> DBResult<T> {
         let (q, v) = s.build_rusqlite(SqliteQueryBuilder);
-        debug!(self.log, "query: {q}"; "sql" => true);
+        trace!(self.log, "query: {q}"; "sql" => true);
 
         sql__query__start!(|| &q);
         let mut s = self.tx.prepare(&q)?;
@@ -685,19 +685,19 @@ impl<'a> Handle<'a> {
 
     pub fn exec_delete(&mut self, d: DeleteStatement) -> DBResult<usize> {
         let (q, v) = d.build_rusqlite(SqliteQueryBuilder);
-        debug!(self.log, "query: {q}"; "sql" => true);
+        trace!(self.log, "query: {q}"; "sql" => true);
         self.exec(q, v)
     }
 
     pub fn exec_update(&mut self, u: UpdateStatement) -> DBResult<usize> {
         let (q, v) = u.build_rusqlite(SqliteQueryBuilder);
-        debug!(self.log, "query: {q}"; "sql" => true);
+        trace!(self.log, "query: {q}"; "sql" => true);
         self.exec(q, v)
     }
 
     pub fn exec_insert(&mut self, i: InsertStatement) -> DBResult<usize> {
         let (q, v) = i.build_rusqlite(SqliteQueryBuilder);
-        debug!(self.log, "query: {q}"; "sql" => true);
+        trace!(self.log, "query: {q}"; "sql" => true);
         self.exec(q, v)
     }