diff --git a/actix-server/CHANGES.md b/actix-server/CHANGES.md index 54096eca..904d6757 100644 --- a/actix-server/CHANGES.md +++ b/actix-server/CHANGES.md @@ -2,6 +2,10 @@ ## Unreleased - 2021-xx-xx +* Reduce the log noise. [#394] + +[#394]: https://github.com/actix/actix-net/pull/394 + ## 2.0.0-beta.6 - 2021-10-11 * Add experimental (semver-exempt) `io-uring` feature for enabling async file I/O on linux. [#374] diff --git a/actix-server/src/accept.rs b/actix-server/src/accept.rs index d9451d37..7fb18af6 100644 --- a/actix-server/src/accept.rs +++ b/actix-server/src/accept.rs @@ -5,7 +5,7 @@ use actix_rt::{ time::{sleep, Instant}, System, }; -use log::{error, info}; +use log::{debug, error}; use mio::{Interest, Poll, Token as MioToken}; use crate::server::Server; @@ -234,7 +234,7 @@ impl Accept { WAKER_TOKEN => { let exit = self.handle_waker(sockets); if exit { - info!("Accept is stopped."); + debug!("Accept is stopped."); return; } } @@ -370,14 +370,14 @@ impl Accept { fn register_logged(&self, info: &mut ServerSocketInfo) { match self.register(info) { - Ok(_) => info!("Resume accepting connections on {}", info.lst.local_addr()), + Ok(_) => debug!("Resume accepting connections on {}", info.lst.local_addr()), Err(e) => error!("Can not register server socket {}", e), } } fn deregister_logged(&self, info: &mut ServerSocketInfo) { match self.poll.registry().deregister(&mut info.lst) { - Ok(_) => info!("Paused accepting connections on {}", info.lst.local_addr()), + Ok(_) => debug!("Paused accepting connections on {}", info.lst.local_addr()), Err(e) => { error!("Can not deregister server socket {}", e) } diff --git a/actix-server/src/builder.rs b/actix-server/src/builder.rs index 871abb5b..23c44882 100644 --- a/actix-server/src/builder.rs +++ b/actix-server/src/builder.rs @@ -7,7 +7,7 @@ use std::{ }; use actix_rt::{self as rt, net::TcpStream, time::sleep, System}; -use log::{error, info}; +use log::{debug, error, info}; use tokio::sync::{ mpsc::{unbounded_channel, UnboundedReceiver}, oneshot, @@ -250,7 +250,7 @@ impl ServerBuilder { if self.sockets.is_empty() { panic!("Server should have at least one bound socket"); } else { - info!("Starting {} workers", self.threads); + debug!("Starting {} workers", self.threads); // start workers let handles = (0..self.threads) @@ -265,7 +265,7 @@ impl ServerBuilder { // start accept thread for sock in &self.sockets { - info!("Starting \"{}\" service on {}", sock.1, sock.2); + debug!("Starting \"{}\" service on {}", sock.1, sock.2); } self.accept.start( mem::take(&mut self.sockets) diff --git a/actix-server/src/worker.rs b/actix-server/src/worker.rs index b99b2da2..38f95706 100644 --- a/actix-server/src/worker.rs +++ b/actix-server/src/worker.rs @@ -17,7 +17,7 @@ use actix_rt::{ Arbiter, }; use futures_core::{future::LocalBoxFuture, ready}; -use log::{error, info, trace}; +use log::{debug, error, trace}; use tokio::sync::{ mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender}, oneshot, @@ -465,11 +465,11 @@ impl Future for ServerWorker { { let num = this.counter.total(); if num == 0 { - info!("Shutting down worker, 0 connections"); + debug!("Shutting down worker, 0 connections"); let _ = tx.send(true); return Poll::Ready(()); } else if graceful { - info!("Graceful worker shutdown, {} connections", num); + debug!("Graceful worker shutdown, {} connections", num); this.shutdown(false); this.state = WorkerState::Shutdown(Shutdown { @@ -478,7 +478,7 @@ impl Future for ServerWorker { tx, }); } else { - info!("Force shutdown worker, {} connections", num); + debug!("Force shutdown worker, {} connections", num); this.shutdown(true); let _ = tx.send(false);