remove P::name() calls from log statements

Author: akundaz

crates/rproxy/src/server/proxy.rs

@@ -54,20 +54,19 @@ where
                 let remote_addr = match stream.peer_addr() {
                     Ok(local_addr) => Some(local_addr.to_string()),
                     Err(err) => {
-                        warn!(proxy = P::name(), error = ?err, "Failed to get remote address");
+                        warn!(error = ?err, "Failed to get remote address");
                         None
                     }
                 };
                 let local_addr = match stream.local_addr() {
                     Ok(local_addr) => Some(local_addr.to_string()),
                     Err(err) => {
-                        warn!(proxy = P::name(), error = ?err, "Failed to get remote address");
+                        warn!(error = ?err, "Failed to get remote address");
                         None
                     }
                 };
 
                 debug!(
-                    proxy = P::name(),
                     connection_id = %id,
                     remote_addr = remote_addr.as_ref().map_or("unknown", |v| v.as_str()),
                     local_addr = local_addr.as_ref().map_or("unknown", |v| v.as_str()),

crates/rproxy/src/server/proxy/http/proxy.rs

@@ -90,7 +90,7 @@ where
     fn new(shared: ProxyHttpSharedState<C, P>, connections_limit: usize) -> Self {
         let id = Uuid::now_v7();
 
-        debug!(proxy = P::name(), worker_id = %id, "Creating http-proxy worker...");
+        debug!(worker_id = %id, "Creating http-proxy worker...");
 
         let config = shared.config();
         let inner = shared.inner();
@@ -147,7 +147,6 @@ where
             Ok(listener) => listener,
             Err(err) => {
                 error!(
-                    proxy = P::name(),
                     addr = %config.listen_address(),
                     error = ?err,
                     "Failed to initialise a socket"
@@ -175,7 +174,6 @@ where
         let client_connections_count = shared.client_connections_count.clone();
 
         info!(
-            proxy = P::name(),
             listen_address = %listen_address,
             workers_count = workers_count,
             max_concurrent_requests_per_worker = max_concurrent_requests_per_worker,
@@ -212,7 +210,6 @@ where
             Ok(server) => server,
             Err(err) => {
                 error!(
-                    proxy = P::name(),
                     error = ?err,
                     "Failed to initialise http-proxy",
                 );
@@ -225,16 +222,16 @@ where
         let mut resetter = resetter.subscribe();
         tokio::spawn(async move {
             if resetter.recv().await.is_ok() {
-                info!(proxy = P::name(), "Reset signal received, stopping http-proxy...");
+                info!("Reset signal received, stopping http-proxy...");
                 handler.stop(true).await;
             }
         });
 
         if let Err(err) = server.await {
-            error!(proxy = P::name(), error = ?err, "Failure while running http-proxy")
+            error!(error = ?err, "Failure while running http-proxy")
         }
 
-        info!(proxy = P::name(), "Stopped http-proxy");
+        info!("Stopped http-proxy");
 
         Ok(())
     }
@@ -325,7 +322,6 @@ where
             Ok(res) => res,
             Err(err) => {
                 warn!(
-                    proxy = P::name(),
                     request_id = %id,
                     connection_id = %connection_id,
                     worker_id = %this.id,
@@ -364,7 +360,6 @@ where
 
         if self.requests.insert_sync(id, req).is_err() {
             error!(
-                proxy = P::name(),
                 request_id = %id,
                 connection_id = %connection_id,
                 worker_id = %self.id,
@@ -378,7 +373,6 @@ where
             Some((_, req)) => req,
             None => {
                 error!(
-                    proxy = P::name(),
                     request_id = %bck_res.info.id,
                     worker_id = %self.id,
                     "Proxied http response for unmatching request",
@@ -446,7 +440,6 @@ where
 
             Err(err) => {
                 warn!(
-                    proxy = P::name(),
                     request_id = %cli_req.info.id,
                     connection_id = %cli_req.info.connection_id,
                     worker_id = %worker_id,
@@ -513,7 +506,6 @@ where
         };
 
         info!(
-            proxy = P::name(),
             request_id = %req.info.id,
             connection_id = %req.info.connection_id,
             worker_id = %worker_id,
@@ -554,7 +546,6 @@ where
         };
 
         info!(
-            proxy = P::name(),
             request_id = %req.info.id,
             connection_id = %req.info.connection_id,
             worker_id = %worker_id,
@@ -806,7 +797,6 @@ where
 {
     fn drop(&mut self) {
         debug!(
-            proxy = P::name(),
             worker_id = %self.id,
             "Destroying http-proxy worker...",
         );
@@ -1045,7 +1035,6 @@ where
                             }
                             Err(err) => {
                                 warn!(
-                                    proxy = P::name(),
                                     request_id = %cli_req.info.id,
                                     connection_id = %cli_req.info.connection_id,
                                     error = ?err,
@@ -1061,7 +1050,6 @@ where
 
                     Err(err) => {
                         warn!(
-                            proxy = P::name(),
                             request_id = %cli_req.info.id,
                             connection_id = %cli_req.info.connection_id,
                             error = ?err,
@@ -1287,15 +1275,13 @@ where
             Poll::Ready(Some(Err(err))) => {
                 if let Some(info) = mem::take(this.info) {
                     warn!(
-                        proxy = P::name(),
                         request_id = %info.id(),
                         connection_id = %info.connection_id(),
                         error = ?err,
                         "Proxy http request stream error",
                     );
                 } else {
                     warn!(
-                        proxy = P::name(),
                         error = ?err,
                         request_id = "unknown",
                         "Proxy http request stream error",
@@ -1385,14 +1371,12 @@ where
             Poll::Ready(Some(Err(err))) => {
                 if let Some(info) = mem::take(this.info) {
                     warn!(
-                        proxy = P::name(),
                         request_id = %info.id(),
                         error = ?err,
                         "Proxy http response stream error",
                     );
                 } else {
                     warn!(
-                        proxy = P::name(),
                         error = ?err,
                         request_id = "unknown",
                         "Proxy http response stream error",