Skip to content

Commit 4d5b557

Browse files
committed
log: renamed disk to file so wording was more accurate
1 parent b9f04be commit 4d5b557

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/kernel/mempool_persist.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ bool LoadMempool(CTxMemPool& pool, const fs::path& load_path, Chainstate& active
4444

4545
AutoFile file{opts.mockable_fopen_function(load_path, "rb")};
4646
if (file.IsNull()) {
47-
LogPrintf("Failed to open mempool file from disk. Continuing anyway.\n");
47+
LogInfo("Failed to open mempool file. Continuing anyway.\n");
4848
return false;
4949
}
5050

@@ -70,12 +70,12 @@ bool LoadMempool(CTxMemPool& pool, const fs::path& load_path, Chainstate& active
7070
uint64_t total_txns_to_load;
7171
file >> total_txns_to_load;
7272
uint64_t txns_tried = 0;
73-
LogInfo("Loading %u mempool transactions from disk...\n", total_txns_to_load);
73+
LogInfo("Loading %u mempool transactions from file...\n", total_txns_to_load);
7474
int next_tenth_to_report = 0;
7575
while (txns_tried < total_txns_to_load) {
7676
const int percentage_done(100.0 * txns_tried / total_txns_to_load);
7777
if (next_tenth_to_report < percentage_done / 10) {
78-
LogInfo("Progress loading mempool transactions from disk: %d%% (tried %u, %u remaining)\n",
78+
LogInfo("Progress loading mempool transactions from file: %d%% (tried %u, %u remaining)\n",
7979
percentage_done, txns_tried, total_txns_to_load - txns_tried);
8080
next_tenth_to_report = percentage_done / 10;
8181
}
@@ -138,11 +138,11 @@ bool LoadMempool(CTxMemPool& pool, const fs::path& load_path, Chainstate& active
138138
}
139139
}
140140
} catch (const std::exception& e) {
141-
LogPrintf("Failed to deserialize mempool data on disk: %s. Continuing anyway.\n", e.what());
141+
LogInfo("Failed to deserialize mempool data on file: %s. Continuing anyway.\n", e.what());
142142
return false;
143143
}
144144

145-
LogPrintf("Imported mempool transactions from disk: %i succeeded, %i failed, %i expired, %i already there, %i waiting for initial broadcast\n", count, failed, expired, already_there, unbroadcast);
145+
LogInfo("Imported mempool transactions from file: %i succeeded, %i failed, %i expired, %i already there, %i waiting for initial broadcast\n", count, failed, expired, already_there, unbroadcast);
146146
return true;
147147
}
148148

@@ -186,7 +186,7 @@ bool DumpMempool(const CTxMemPool& pool, const fs::path& dump_path, FopenFn mock
186186

187187
uint64_t mempool_transactions_to_write(vinfo.size());
188188
file << mempool_transactions_to_write;
189-
LogInfo("Writing %u mempool transactions to disk...\n", mempool_transactions_to_write);
189+
LogInfo("Writing %u mempool transactions to file...\n", mempool_transactions_to_write);
190190
for (const auto& i : vinfo) {
191191
file << TX_WITH_WITNESS(*(i.tx));
192192
file << int64_t{count_seconds(i.m_time)};
@@ -196,7 +196,7 @@ bool DumpMempool(const CTxMemPool& pool, const fs::path& dump_path, FopenFn mock
196196

197197
file << mapDeltas;
198198

199-
LogPrintf("Writing %d unbroadcast transactions to disk.\n", unbroadcast_txids.size());
199+
LogInfo("Writing %d unbroadcast transactions to file.\n", unbroadcast_txids.size());
200200
file << unbroadcast_txids;
201201

202202
if (!skip_file_commit && !FileCommit(file.Get()))
@@ -212,7 +212,7 @@ bool DumpMempool(const CTxMemPool& pool, const fs::path& dump_path, FopenFn mock
212212
Ticks<SecondsDouble>(last - mid),
213213
fs::file_size(dump_path));
214214
} catch (const std::exception& e) {
215-
LogPrintf("Failed to dump mempool: %s. Continuing anyway.\n", e.what());
215+
LogInfo("Failed to dump mempool: %s. Continuing anyway.\n", e.what());
216216
return false;
217217
}
218218
return true;

0 commit comments

Comments
 (0)