Remove unneeded log entries that caused noise

Thaddeus19 · Jan 27, 2021 · fb3daf6 · fb3daf6
1 parent 24c7a2d
commit fb3daf6
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 119 deletions.
diff --git a/core/bin/zksync_api/src/api_server/loggers.rs b/core/bin/zksync_api/src/api_server/loggers.rs
diff --git a/core/bin/zksync_api/src/api_server/mod.rs b/core/bin/zksync_api/src/api_server/mod.rs
@@ -19,7 +19,6 @@ use crate::signature_checker;
 mod admin_server;
 mod event_notify;
 mod helpers;
-mod loggers;
 mod rest;
 pub mod rpc_server;
 mod rpc_subscriptions;

diff --git a/core/bin/zksync_api/src/api_server/rest/mod.rs b/core/bin/zksync_api/src/api_server/rest/mod.rs
@@ -1,5 +1,5 @@
 use actix_cors::Cors;
-use actix_web::{middleware, web, App, HttpResponse, HttpServer};
+use actix_web::{web, App, HttpResponse, HttpServer};
 use futures::channel::mpsc;
 use std::net::SocketAddr;
 use zksync_storage::ConnectionPool;
@@ -23,8 +23,6 @@ async fn start_server(
     sign_verifier: mpsc::Sender<VerifyTxSignatureRequest>,
     bind_to: SocketAddr,
 ) {
-    let logger_format = crate::api_server::loggers::rest::get_logger_format();
-
     HttpServer::new(move || {
         let api_v01 = api_v01.clone();
 
@@ -39,7 +37,6 @@ async fn start_server(
         };
 
         App::new()
-            .wrap(middleware::Logger::new(&logger_format))
             .wrap(Cors::new().send_wildcard().max_age(3600).finish())
             .service(api_v01.into_scope())
             .service(api_v1_scope)

diff --git a/core/bin/zksync_api/src/api_server/rpc_server/mod.rs b/core/bin/zksync_api/src/api_server/rpc_server/mod.rs
@@ -428,7 +428,6 @@ pub fn start_rpc_server(
         rpc_app.extend(&mut io);
 
         let server = ServerBuilder::new(io)
-            .request_middleware(super::loggers::http_rpc::request_middleware)
             .threads(super::THREADS_PER_SERVER)
             .start_http(&addr)
             .unwrap();

diff --git a/core/bin/zksync_api/src/api_server/rpc_server/rpc_impl.rs b/core/bin/zksync_api/src/api_server/rpc_server/rpc_impl.rs
@@ -32,12 +32,6 @@ impl RpcApp {
         )
         .await?;
 
-        vlog::debug!(
-            "account_info: address {}, total request processing {}ms",
-            &address,
-            start.elapsed().as_millis()
-        );
-
         metrics::histogram!("api.rpc.account_info", start.elapsed());
         Ok(AccountInfoResp {
             address,

diff --git a/core/bin/zksync_api/src/api_server/rpc_subscriptions.rs b/core/bin/zksync_api/src/api_server/rpc_subscriptions.rs
@@ -220,7 +220,6 @@ pub fn start_ws_server(
             io,
             |context: &RequestContext| Arc::new(Session::new(context.sender())),
         )
-        .request_middleware(super::loggers::ws_rpc::request_middleware)
         .max_connections(1000)
         .event_loop_executor(task_executor.executor())
         .start(&addr)

diff --git a/core/bin/zksync_core/src/mempool.rs b/core/bin/zksync_core/src/mempool.rs
@@ -270,8 +270,12 @@ impl MempoolBlocksHandler {
             .await;
         let (_chunks_left, txs) = self.prepare_tx_for_block(chunks_left).await;
 
-        vlog::debug!("Proposed priority ops for block: {:#?}", priority_ops);
-        vlog::debug!("Proposed txs for block: {:#?}", txs);
+        if !priority_ops.is_empty() {
+            vlog::debug!("Proposed priority ops for block: {:?}", priority_ops);
+        }
+        if !txs.is_empty() {
+            vlog::debug!("Proposed txs for block: {:?}", txs);
+        }
         metrics::histogram!("mempool.propose_new_block", start.elapsed());
         ProposedBlock { priority_ops, txs }
     }