Update log messages

mobilecoinfoundation · Apr 1, 2023 · 5a71ef4 · 5a71ef4
1 parent 5d9a822
commit 5a71ef4
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 17 deletions.
diff --git a/ledger/sync/src/ledger_sync/ledger_sync_service.rs b/ledger/sync/src/ledger_sync/ledger_sync_service.rs
@@ -25,6 +25,7 @@ use mc_util_telemetry::{
 use mc_util_uri::ConnectionUri;
 use retry::delay::Fibonacci;
 use std::{
+    cmp::min,
     collections::{BTreeMap, HashMap, HashSet},
     sync::{Arc, Condvar, Mutex},
     thread,
@@ -41,6 +42,8 @@ const MAX_CONCURRENT_GET_BLOCK_CONTENTS_CALLS: usize = 50;
 /// Telemetry metadata: number of blocks appended to the local ledger.
 const TELEMETRY_NUM_BLOCKS_APPENDED: Key = telemetry_static_key!("num-blocks-appended");
 
+const MAX_SLEEP_INTERVAL: Duration = Duration::from_secs(60);
+
 pub struct LedgerSyncService<
     L: Ledger,
     BC: BlockchainConnection + 'static,
@@ -719,7 +722,8 @@ fn get_block_contents<TF: TransactionsFetcher + 'static>(
                                     // Sleep, with a linearly increasing delay. This prevents
                                     // endless retries
                                     // as long as the deadline is not exceeded.
-                                    thread::sleep(Duration::from_secs(num_attempts + 1));
+                                    let attempts = Duration::from_secs(num_attempts + 1);
+                                    thread::sleep(min(attempts, MAX_SLEEP_INTERVAL));
 
                                     // Put back to queue for a retry
                                     thread_sender

diff --git a/mobilecoind/src/sync.rs b/mobilecoind/src/sync.rs
@@ -167,7 +167,7 @@ impl SyncThread {
                             }
 
                             // This monitor has blocks to process, put it in the queue.
-                            log::info!(
+                            log::debug!(
                                 logger,
                                 "sync thread noticed monitor {} needs syncing",
                                 monitor_id,

diff --git a/watcher/src/bin/main.rs b/watcher/src/bin/main.rs
@@ -173,7 +173,7 @@ impl WatcherSyncThread {
             // Decide next step before continuing based on sync result
             match sync_result {
                 SyncResult::AllBlocksSynced => {
-                    log::info!(logger, "sync_blocks indicates we're done");
+                    log::info!(logger, "Block synchronization done");
                     break;
                 }
                 SyncResult::BlockSyncError => {

diff --git a/watcher/src/verification_reports_collector.rs b/watcher/src/verification_reports_collector.rs
@@ -308,7 +308,16 @@ impl<NC: NodeClient> VerificationReportsCollectorThread<NC> {
         verification_report: &VerificationReport,
     ) {
         let verification_report_block_signer = match NC::get_block_signer(verification_report) {
-            Ok(key) => key,
+            Ok(key) => {
+                // TODO: Add encode to key's Display impl
+                log::info!(
+                    self.logger,
+                    "Verification report from {} has block signer {}",
+                    node_url,
+                    hex::encode(key.to_bytes())
+                );
+                key
+            }
             Err(err) => {
                 log::error!(
                     self.logger,
@@ -320,13 +329,6 @@ impl<NC: NodeClient> VerificationReportsCollectorThread<NC> {
             }
         };
 
-        log::info!(
-            self.logger,
-            "Verification report from {} has block signer {}",
-            node_url,
-            hex::encode(verification_report_block_signer.to_bytes())
-        );
-
         // Store the VerificationReport in the database, and also remove
         // verification_report_block_signer and potential_signers from the polling
         // queue.

diff --git a/watcher/src/watcher.rs b/watcher/src/watcher.rs
@@ -137,12 +137,24 @@ impl Watcher {
         max_blocks_per_iteration: Option<usize>,
         log_sync_failures: bool,
     ) -> Result<SyncResult, WatcherError> {
-        log::info!(
-            self.logger,
-            "Now syncing signatures from {} to {:?}",
-            start,
-            max_block_height,
-        );
+        match max_block_height {
+            None => {
+                log::debug!(
+                    self.logger,
+                    "Now syncing signatures from {} to {:?}",
+                    start,
+                    max_block_height,
+                );
+            }
+            Some(_) => {
+                log::info!(
+                    self.logger,
+                    "Now syncing signatures from {} to {:?}",
+                    start,
+                    max_block_height,
+                );
+            }
+        }
 
         let mut counter = 0usize;