From 1c8fcaebbc2f385acece09f7fcc2fd565daae1c4 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Fri, 22 Oct 2021 18:17:26 +0100
Subject: [PATCH] tweak server logging

---
 actix-server/src/accept.rs  |  8 ++++----
 actix-server/src/builder.rs | 20 ++++++++++++--------
 actix-server/src/worker.rs  |  6 +++---
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/actix-server/src/accept.rs b/actix-server/src/accept.rs
index 504f452d..5fef2fe2 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, info};
 use mio::{Interest, Poll, Token as MioToken};
 
 use crate::server::Server;
@@ -229,7 +229,7 @@ impl Accept {
                     WAKER_TOKEN => {
                         let exit = self.handle_waker(sockets);
                         if exit {
-                            info!("Accept is stopped.");
+                            info!("Accept thread stopped");
                             return;
                         }
                     }
@@ -365,14 +365,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..8d0684c6 100644
--- a/actix-server/src/builder.rs
+++ b/actix-server/src/builder.rs
@@ -250,7 +250,14 @@ impl ServerBuilder {
         if self.sockets.is_empty() {
             panic!("Server should have at least one bound socket");
         } else {
-            info!("Starting {} workers", self.threads);
+            for (_, name, lst) in &self.sockets {
+                info!(
+                    r#"Starting service: "{}", workers: {}, listening on: {}"#,
+                    name,
+                    self.threads,
+                    lst.local_addr()
+                );
+            }
 
             // start workers
             let handles = (0..self.threads)
@@ -264,9 +271,6 @@ impl ServerBuilder {
                 .collect();
 
             // start accept thread
-            for sock in &self.sockets {
-                info!("Starting \"{}\" service on {}", sock.1, sock.2);
-            }
             self.accept.start(
                 mem::take(&mut self.sockets)
                     .into_iter()
@@ -312,7 +316,7 @@ impl ServerBuilder {
                 // Handle `SIGINT`, `SIGTERM`, `SIGQUIT` signals and stop actix system
                 match sig {
                     Signal::Int => {
-                        info!("SIGINT received, starting forced shutdown");
+                        info!("SIGINT received; starting forced shutdown");
                         self.exit = true;
                         self.handle_cmd(ServerCommand::Stop {
                             graceful: false,
@@ -321,7 +325,7 @@ impl ServerBuilder {
                     }
 
                     Signal::Term => {
-                        info!("SIGTERM received, starting graceful shutdown");
+                        info!("SIGTERM received; starting graceful shutdown");
                         self.exit = true;
                         self.handle_cmd(ServerCommand::Stop {
                             graceful: true,
@@ -330,7 +334,7 @@ impl ServerBuilder {
                     }
 
                     Signal::Quit => {
-                        info!("SIGQUIT received, starting forced shutdown");
+                        info!("SIGQUIT received; starting forced shutdown");
                         self.exit = true;
                         self.handle_cmd(ServerCommand::Stop {
                             graceful: false,
@@ -390,7 +394,7 @@ impl ServerBuilder {
                 }
 
                 if found {
-                    error!("Worker has died {:?}, restarting", idx);
+                    error!("Worker {} has died; restarting", idx);
 
                     let mut new_idx = self.handles.len();
                     'found: loop {
diff --git a/actix-server/src/worker.rs b/actix-server/src/worker.rs
index ffe36f61..f8550e18 100644
--- a/actix-server/src/worker.rs
+++ b/actix-server/src/worker.rs
@@ -466,11 +466,11 @@ impl Future for ServerWorker {
         {
             let num = this.counter.total();
             if num == 0 {
-                info!("Shutting down worker, 0 connections");
+                info!("Shutting down idle worker");
                 let _ = tx.send(true);
                 return Poll::Ready(());
             } else if graceful {
-                info!("Graceful worker shutdown, {} connections", num);
+                info!("Graceful worker shutdown; finishing {} connections", num);
                 this.shutdown(false);
 
                 this.state = WorkerState::Shutdown(Shutdown {
@@ -479,7 +479,7 @@ impl Future for ServerWorker {
                     tx,
                 });
             } else {
-                info!("Force shutdown worker, {} connections", num);
+                info!("Force shutdown worker, closing {} connections", num);
                 this.shutdown(true);
 
                 let _ = tx.send(false);