Replace println with logging

JoelLinn · Nov 4, 2021 · d6dd411 · d6dd411
1 parent 2b07369
commit d6dd411
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/examples/simple/sql2ldap.toml b/examples/simple/sql2ldap.toml
@@ -5,7 +5,7 @@ ip          = "0.0.0.0"
 #threads     =
 # Limit capabilities using seccomp bpf (experimental)
 #seccomp     = false
-# Print queries to stdout
+# Set log level to debug
 debug       = true
 
 [sql]

diff --git a/src/ldap_session.rs b/src/ldap_session.rs
@@ -98,7 +98,6 @@ impl LdapSession {
                     return vec![lsr.gen_error(LdapResultCode::NoSuchObject, "".to_owned())];
                 }
                 cn_base_search = Some(ident_split[1].to_owned());
-                println!("{}", ident);
             }
         } else if base_lower != suffix_lower {
             // no infinite tree depths

diff --git a/src/main.rs b/src/main.rs
@@ -92,7 +92,7 @@ fn main() -> Result<(), String> {
         && cfg!(target_os = "linux")
         && (cfg!(target_arch = "x86_64") || cfg!(target_arch = "aarch64"))
     {
-        println!("Warning 🧪: The seccomp filter is highly experimental and known to crash in some configurations!");
+        log::warn!("🧪 The seccomp filtering is highly experimental and known to crash in some configurations! 🧪");
         Some(
             build_seccomp_program()
                 .map_err(|err| format!("Error compiling seccomp filter: {}", err))?,
@@ -142,7 +142,7 @@ fn main() -> Result<(), String> {
             // Initiate the acceptor task.
             tokio::spawn(acceptor(listener_tokio, config, db_pool));
 
-            println!("serving ldap://{} ...", addr);
+            log::info!("serving ldap://{} ...", addr);
             if cfg![target_family = "unix"] {
                 use tokio::signal::unix::*;
                 let err_msg = |err| format!("Failed to install signal handler: {}", err);
@@ -475,13 +475,11 @@ async fn handle_client(
     while let Some(msg) = reqs.next().await {
         // TODO switch to full Op handling
         let search_sizelimit = match &msg {
-            Ok(msg) => {
-                match &msg.op {
-                    ldap3_server::proto::LdapOp::SearchRequest(req) => req.sizelimit,
-                    _ => 0,
-                }
+            Ok(msg) => match &msg.op {
+                ldap3_server::proto::LdapOp::SearchRequest(req) => req.sizelimit,
+                _ => 0,
             },
-            Err(_) => 0
+            Err(_) => 0,
         };
 
         let server_op = match msg