From ff92b079ca7d49cb06763264beb40099a7e695df Mon Sep 17 00:00:00 2001
From: sowle <crypto.sowle@gmail.com>
Date: Sun, 9 Aug 2020 01:30:34 +0300
Subject: [PATCH] wallet: log improved in rpc mode

---
 src/wallet/wallet2.cpp | 5 ++---
 src/wallet/wallet2.h   | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 6b12e02d..c3f8ffb2 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -522,7 +522,6 @@ void wallet2::process_new_transaction(const currency::transaction& tx, uint64_t
         td.m_ptx_wallet_info = pwallet_info;
         td.m_internal_output_index = o;
         td.m_key_image = ki;
-        LOG_PRINT_L0("pglobal_indexes = " << pglobal_indexes);
         if (m_use_deffered_global_outputs)
         {
           if (pglobal_indexes && pglobal_indexes->size() > o)
@@ -1487,7 +1486,7 @@ void wallet2::handle_pulled_blocks(size_t& blocks_added, std::atomic<bool>& stop
     }
   }
 
-  WLT_LOG_L1("[PULL BLOCKS] " << res.start_height << " --> " << get_blockchain_current_size());
+  WLT_LOG_L2("[PULL BLOCKS] " << res.start_height << " --> " << get_blockchain_current_size() - 1);
 }
 //----------------------------------------------------------------------------------------------------
 uint64_t wallet2::get_sync_progress()
@@ -1911,7 +1910,7 @@ void wallet2::refresh(size_t & blocks_fetched, bool& received_money, std::atomic
   }
   
 
-  WLT_LOG_L1("Refresh done, blocks received: " << blocks_fetched << ", balance: " << print_money(balance()) << ", unlocked: " << print_money(unlocked_balance()));
+  WLT_LOG("Refresh done, blocks received: " << blocks_fetched << ", balance: " << print_money(balance()) << ", unlocked: " << print_money(unlocked_balance()), blocks_fetched > 0 ? LOG_LEVEL_1 : LOG_LEVEL_2);
 }
 //----------------------------------------------------------------------------------------------------
 bool wallet2::handle_expiration_list(uint64_t tx_expiration_ts_median)
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 855743a9..606b7d7c 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -62,6 +62,7 @@ const uint64_t WALLET_GLOBAL_OUTPUT_INDEX_UNDEFINED = std::numeric_limits<uint64
 #define LOG_DEFAULT_CHANNEL "wallet"
 
 // wallet-specific logging functions
+#define WLT_LOG(msg, level) LOG_PRINT("[W:" << m_log_prefix << "] " << msg, level)
 #define WLT_LOG_L0(msg) LOG_PRINT_L0("[W:" << m_log_prefix << "] " << msg)
 #define WLT_LOG_L1(msg) LOG_PRINT_L1("[W:" << m_log_prefix << "] " << msg)
 #define WLT_LOG_L2(msg) LOG_PRINT_L2("[W:" << m_log_prefix << "] " << msg)
@@ -1244,6 +1245,7 @@ namespace tools
 } // namespace tools
 
 #if !defined(KEEP_WALLET_LOG_MACROS)
+#undef WLT_LOG
 #undef WLT_LOG_L0
 #undef WLT_LOG_L1
 #undef WLT_LOG_L2