Skip to content

Commit 620ac6e

Browse files
committed
Tag all remaining operational log lines with chain/protocol prefix
Additional tagged lines: [P2Pool] run_think(), think():best, Trimmed, Loaded shares, Requesting/Sending/Received shares [LTC] Pool block merkle_root validated, Block meets target, Peer reports height [LTC] Embedded broadcaster, Phase 4 embedded, Connecting to RPC Startup/config messages left untagged (they're one-time, context is clear). Runtime operational messages now all have [LTC]/[DOGE]/[P2Pool]/[Stratum]/[MM:X] prefix.
1 parent 8c33a48 commit 620ac6e

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

src/c2pool/c2pool_refactored.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ int main(int argc, char* argv[]) {
990990
std::unique_ptr<ltc::coin::EmbeddedCoinNode> embedded_node;
991991

992992
if (embedded_ltc) {
993-
LOG_INFO << "Phase 4: embedded LTC coin node mode (no daemon required)";
993+
LOG_INFO << "[LTC] Phase 4: embedded coin node mode (no daemon required)";
994994

995995
auto ltc_params = settings->m_testnet
996996
? ltc::coin::LTCChainParams::testnet()
@@ -1072,12 +1072,12 @@ int main(int argc, char* argv[]) {
10721072
embedded_broadcaster->set_on_peer_height(
10731073
[chain = embedded_chain.get()](uint32_t h) {
10741074
chain->set_peer_tip_height(h);
1075-
LOG_INFO << "Peer reports chain height " << h
1075+
LOG_INFO << "[LTC] Peer reports chain height " << h
10761076
<< " — fast-sync: scrypt skip below " << (h > 2100 ? h - 2100 : 0);
10771077
});
10781078

10791079
embedded_broadcaster->start();
1080-
LOG_INFO << "Embedded LTC broadcaster started, connecting to "
1080+
LOG_INFO << "[LTC] Embedded broadcaster started, connecting to "
10811081
<< p2p_host << ":" << (coind_p2p_port > 0 ? coind_p2p_port : 19335);
10821082
// NOTE: set_on_new_headers and set_embedded_node are wired after web_server is created below
10831083

@@ -1089,7 +1089,7 @@ int main(int argc, char* argv[]) {
10891089
if (rpc_port == 19332 && !settings->m_testnet)
10901090
rpc_port = 9332; // mainnet LTC
10911091

1092-
LOG_INFO << "Connecting to coin daemon RPC at " << rpc_host << ":" << rpc_port;
1092+
LOG_INFO << "[LTC] Connecting to coin daemon RPC at " << rpc_host << ":" << rpc_port;
10931093
node_rpc->connect(NetService(rpc_host, static_cast<uint16_t>(rpc_port)),
10941094
rpc_user + ":" + rpc_pass);
10951095
}

src/core/web_server.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3898,7 +3898,7 @@ nlohmann::json MiningInterface::mining_submit(const std::string& username, const
38983898
static uint256 s_last_submitted_prev;
38993899
if (prev_block != s_last_submitted_prev) {
39003900
s_last_submitted_prev = prev_block;
3901-
LOG_INFO << "Block meets blockchain target! Submitting to coin daemon";
3901+
LOG_INFO << "[LTC] Block meets blockchain target! Submitting to coin daemon";
39023902
submitblock(block_hex);
39033903
}
39043904
}
@@ -4161,7 +4161,7 @@ nlohmann::json MiningInterface::mining_submit(const std::string& username, const
41614161
static uint256 s_last_pool_submitted_prev;
41624162
if (prev_block != s_last_pool_submitted_prev) {
41634163
s_last_pool_submitted_prev = prev_block;
4164-
LOG_INFO << "Pool block merkle_root validated, submitting to coin daemon";
4164+
LOG_INFO << "[LTC] Pool block merkle_root validated, submitting to coin daemon";
41654165
submitblock(block_hex);
41664166
}
41674167
}

src/impl/ltc/node.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ std::vector<ltc::ShareType> NodeImpl::handle_get_share(std::vector<uint256> hash
366366

367367
if (!shares.empty())
368368
{
369-
LOG_INFO << "Sending " << shares.size() << " shares to " << peer_addr.to_string();
369+
LOG_INFO << "[P2Pool] Sending " << shares.size() << " shares to " << peer_addr.to_string();
370370
}
371371
return shares;
372372
}
@@ -461,7 +461,7 @@ void NodeImpl::send_shares(peer_ptr peer, const std::vector<uint256>& share_hash
461461
peer->write(std::move(ftx_msg));
462462
}
463463

464-
LOG_INFO << "Sent " << shares.size() << " shares (+" << needed_txs.size()
464+
LOG_INFO << "[P2Pool] Sent " << shares.size() << " shares (+" << needed_txs.size()
465465
<< " txs) to " << peer->addr().to_string();
466466
}
467467

@@ -526,7 +526,7 @@ void NodeImpl::download_shares(peer_ptr peer, const uint256& target_hash)
526526
std::vector<uint256> hashes = { target_hash };
527527
std::vector<uint256> stops; // empty — don't stop early, let handle_get_share apply limits
528528

529-
LOG_INFO << "Requesting shares from " << peer->addr().to_string()
529+
LOG_INFO << "[P2Pool] Requesting shares from " << peer->addr().to_string()
530530
<< " starting at " << target_hash.ToString()
531531
<< " (parents=" << PARENTS_PER_REQUEST << ")";
532532

@@ -544,7 +544,7 @@ void NodeImpl::download_shares(peer_ptr peer, const uint256& target_hash)
544544
return;
545545
}
546546

547-
LOG_INFO << "Received " << reply.m_items.size() << " shares for download request";
547+
LOG_INFO << "[P2Pool] Received " << reply.m_items.size() << " shares for download request";
548548

549549
// Feed into processing pipeline
550550
HandleSharesData data;
@@ -617,7 +617,7 @@ void NodeImpl::load_persisted_shares()
617617
}
618618
}
619619

620-
LOG_INFO << "Loaded " << loaded << " shares from LevelDB storage";
620+
LOG_INFO << "[P2Pool] Loaded " << loaded << " shares from LevelDB storage";
621621
}
622622

623623
void NodeImpl::start_outbound_connections()
@@ -674,7 +674,7 @@ void NodeImpl::run_think()
674674
if (m_think_running.exchange(true))
675675
return;
676676

677-
LOG_INFO << "run_think(): chain=" << m_tracker.chain.size()
677+
LOG_INFO << "[P2Pool] run_think(): chain=" << m_tracker.chain.size()
678678
<< " verified=" << m_tracker.verified.size()
679679
<< " heads=" << m_tracker.chain.get_heads().size();
680680

@@ -711,7 +711,7 @@ void NodeImpl::run_think()
711711
total_removed += removed;
712712
}
713713
if (total_removed > 0)
714-
LOG_INFO << "Trimmed " << total_removed << " old shares from " << label
714+
LOG_INFO << "[P2Pool] Trimmed " << total_removed << " old shares from " << label
715715
<< " (now " << sc.size() << ")";
716716
};
717717
trim_chain(m_tracker.verified, "verified", /*owns_data=*/false);
@@ -750,7 +750,7 @@ void NodeImpl::run_think()
750750
// Update best share
751751
if (!result.best.IsNull()) {
752752
m_best_share_hash = result.best;
753-
LOG_INFO << "think(): best=" << result.best.GetHex().substr(0, 16) << "...";
753+
LOG_INFO << "[P2Pool] think(): best=" << result.best.GetHex().substr(0, 16) << "...";
754754
} else {
755755
LOG_WARNING << "think(): result.best is NULL — verified_tails="
756756
<< m_tracker.verified.get_tails().size()

0 commit comments

Comments
 (0)