diff --git a/src/ripple/app/consensus/RCLConsensus.h b/src/ripple/app/consensus/RCLConsensus.h index 8298a96024..ef3fb8206c 100644 --- a/src/ripple/app/consensus/RCLConsensus.h +++ b/src/ripple/app/consensus/RCLConsensus.h @@ -59,7 +59,7 @@ class RCLConsensus LedgerMaster& ledgerMaster_; LocalTxs& localTxs_; InboundTransactions& inboundTransactions_; - beast::Journal j_; + beast::Journal const j_; NodeID const nodeID_; PublicKey const valPublic_; @@ -389,7 +389,7 @@ class RCLConsensus std::chrono::milliseconds roundTime, std::set& failedTxs); - /** Validate the given ledger and share with peers as necessary + /** Validate the given ledger and share with peers as necessary @param ledger The ledger to validate @param txns The consensus transaction set @@ -515,7 +515,7 @@ private: Adaptor adaptor_; Consensus consensus_; - beast::Journal j_; + beast::Journal const j_; }; } diff --git a/src/ripple/app/consensus/RCLValidations.cpp b/src/ripple/app/consensus/RCLValidations.cpp index af0ebb893b..86a3e5207d 100644 --- a/src/ripple/app/consensus/RCLValidations.cpp +++ b/src/ripple/app/consensus/RCLValidations.cpp @@ -167,7 +167,7 @@ handleNewValidation(Application& app, bool shouldRelay = false; RCLValidations& validations = app.getValidations(); - beast::Journal j = validations.adaptor().journal(); + beast::Journal const j = validations.adaptor().journal(); auto dmp = [&](beast::Journal::Stream s, std::string const& msg) { s << "Val for " << hash diff --git a/src/ripple/app/ledger/ConsensusTransSetSF.h b/src/ripple/app/ledger/ConsensusTransSetSF.h index 9daef878d1..21c138c03b 100644 --- a/src/ripple/app/ledger/ConsensusTransSetSF.h +++ b/src/ripple/app/ledger/ConsensusTransSetSF.h @@ -50,7 +50,7 @@ public: private: Application& app_; NodeCache& m_nodeCache; - beast::Journal j_; + beast::Journal const j_; }; } // ripple diff --git a/src/ripple/app/ledger/OpenLedger.h b/src/ripple/app/ledger/OpenLedger.h index ffd186595f..4b28294e00 100644 --- a/src/ripple/app/ledger/OpenLedger.h +++ b/src/ripple/app/ledger/OpenLedger.h @@ -49,7 +49,7 @@ using OrderedTxs = CanonicalTXSet; class OpenLedger { private: - beast::Journal j_; + beast::Journal const j_; CachedSLEs& cache_; std::mutex mutable modify_mutex_; std::mutex mutable current_mutex_; diff --git a/src/ripple/app/ledger/OrderBookDB.h b/src/ripple/app/ledger/OrderBookDB.h index 890732ebeb..8ce0ed7dac 100644 --- a/src/ripple/app/ledger/OrderBookDB.h +++ b/src/ripple/app/ledger/OrderBookDB.h @@ -82,7 +82,7 @@ private: std::uint32_t mSeq; - beast::Journal j_; + beast::Journal const j_; }; } // ripple diff --git a/src/ripple/app/ledger/impl/InboundLedgers.cpp b/src/ripple/app/ledger/impl/InboundLedgers.cpp index 4f933f30e3..589dfc3d79 100644 --- a/src/ripple/app/ledger/impl/InboundLedgers.cpp +++ b/src/ripple/app/ledger/impl/InboundLedgers.cpp @@ -42,7 +42,7 @@ private: std::mutex fetchRateMutex_; // measures ledgers per second, constants are important DecayWindow<30, clock_type> fetchRate_; - beast::Journal j_; + beast::Journal const j_; public: using u256_acq_pair = std::pair< diff --git a/src/ripple/app/ledger/impl/LedgerCleaner.cpp b/src/ripple/app/ledger/impl/LedgerCleaner.cpp index b75472b133..41c07faaed 100644 --- a/src/ripple/app/ledger/impl/LedgerCleaner.cpp +++ b/src/ripple/app/ledger/impl/LedgerCleaner.cpp @@ -44,7 +44,7 @@ Cleans up the ledger. Specifically, resolves these issues: class LedgerCleanerImp : public LedgerCleaner { Application& app_; - beast::Journal j_; + beast::Journal const j_; mutable std::mutex mutex_; mutable std::condition_variable wakeup_; diff --git a/src/ripple/app/main/Application.cpp b/src/ripple/app/main/Application.cpp index 03daa5ba9a..e775b012f2 100644 --- a/src/ripple/app/main/Application.cpp +++ b/src/ripple/app/main/Application.cpp @@ -92,7 +92,7 @@ private: FullBelowCache fullbelow_; NodeStore::Database& db_; bool const shardBacked_; - beast::Journal j_; + beast::Journal const j_; // missing node handler LedgerIndex maxSeq = 0; diff --git a/src/ripple/app/main/LoadManager.h b/src/ripple/app/main/LoadManager.h index 467487a586..de504df259 100644 --- a/src/ripple/app/main/LoadManager.h +++ b/src/ripple/app/main/LoadManager.h @@ -90,7 +90,7 @@ private: private: Application& app_; - beast::Journal journal_; + beast::Journal const journal_; std::thread thread_; std::mutex mutex_; // Guards deadLock_, armed_, and stop_. diff --git a/src/ripple/app/misc/FeeVoteImpl.cpp b/src/ripple/app/misc/FeeVoteImpl.cpp index e795b79aea..cce06c81d6 100644 --- a/src/ripple/app/misc/FeeVoteImpl.cpp +++ b/src/ripple/app/misc/FeeVoteImpl.cpp @@ -91,7 +91,7 @@ class FeeVoteImpl : public FeeVote { private: Setup target_; - beast::Journal journal_; + beast::Journal const journal_; public: FeeVoteImpl (Setup const& setup, beast::Journal journal); diff --git a/src/ripple/app/misc/LoadFeeTrack.h b/src/ripple/app/misc/LoadFeeTrack.h index 465d4e633e..f7ad2700e4 100644 --- a/src/ripple/app/misc/LoadFeeTrack.h +++ b/src/ripple/app/misc/LoadFeeTrack.h @@ -128,7 +128,7 @@ private: static std::uint32_t constexpr lftFeeDecFraction = 4; // decrease fee by 1/4 static std::uint32_t constexpr lftFeeMax = lftNormalFee * 1000000; - beast::Journal j_; + beast::Journal const j_; std::mutex mutable lock_; std::uint32_t localTxnLoadFee_; // Scale factor, lftNormalFee = normal fee diff --git a/src/ripple/app/misc/SHAMapStoreImp.h b/src/ripple/app/misc/SHAMapStoreImp.h index 59b8f6d2ad..ea2579dd00 100644 --- a/src/ripple/app/misc/SHAMapStoreImp.h +++ b/src/ripple/app/misc/SHAMapStoreImp.h @@ -54,7 +54,7 @@ private: public: soci::session session_; std::mutex mutex_; - beast::Journal journal_; + beast::Journal const journal_; // Just instantiate without any logic in case online delete is not // configured @@ -86,7 +86,7 @@ private: static std::uint32_t const minimumDeletionIntervalSA_ = 8; NodeStore::Scheduler& scheduler_; - beast::Journal journal_; + beast::Journal const journal_; NodeStore::DatabaseRotating* dbRotating_ = nullptr; SavedStateDB state_db_; std::thread thread_; diff --git a/src/ripple/app/misc/TxQ.h b/src/ripple/app/misc/TxQ.h index 71bf41a0a1..0d29b28a71 100644 --- a/src/ripple/app/misc/TxQ.h +++ b/src/ripple/app/misc/TxQ.h @@ -371,7 +371,7 @@ private: /// when fee escalation kicks in. std::uint64_t escalationMultiplier_; /// Journal - beast::Journal j_; + beast::Journal const j_; public: /// Constructor @@ -655,7 +655,7 @@ private: /// Setup parameters used to control the behavior of the queue Setup const setup_; /// Journal - beast::Journal j_; + beast::Journal const j_; /** Tracks the current state of the queue. @note This member must always and only be accessed under diff --git a/src/ripple/app/misc/ValidatorList.h b/src/ripple/app/misc/ValidatorList.h index b837266c9f..ad24c3e608 100644 --- a/src/ripple/app/misc/ValidatorList.h +++ b/src/ripple/app/misc/ValidatorList.h @@ -128,7 +128,7 @@ class ValidatorList ManifestCache& validatorManifests_; ManifestCache& publisherManifests_; TimeKeeper& timeKeeper_; - beast::Journal j_; + beast::Journal const j_; std::shared_timed_mutex mutable mutex_; std::atomic quorum_; diff --git a/src/ripple/app/misc/ValidatorSite.h b/src/ripple/app/misc/ValidatorSite.h index 608372f2b2..655a93ca71 100644 --- a/src/ripple/app/misc/ValidatorSite.h +++ b/src/ripple/app/misc/ValidatorSite.h @@ -110,7 +110,7 @@ private: }; Application& app_; - beast::Journal j_; + beast::Journal const j_; std::mutex mutable sites_mutex_; std::mutex mutable state_mutex_; diff --git a/src/ripple/app/misc/impl/AmendmentTable.cpp b/src/ripple/app/misc/impl/AmendmentTable.cpp index 1279ca4416..df2f7257c9 100644 --- a/src/ripple/app/misc/impl/AmendmentTable.cpp +++ b/src/ripple/app/misc/impl/AmendmentTable.cpp @@ -159,7 +159,7 @@ protected: // True if an unsupported amendment is enabled bool unsupportedEnabled_; - beast::Journal j_; + beast::Journal const j_; // Finds or creates state AmendmentState* add (uint256 const& amendment); diff --git a/src/ripple/app/paths/PathState.h b/src/ripple/app/paths/PathState.h index 72f4fdc5f6..83927a3b1a 100644 --- a/src/ripple/app/paths/PathState.h +++ b/src/ripple/app/paths/PathState.h @@ -169,7 +169,7 @@ private: // Source may only be used there if not mentioned by an account. AccountIssueToNodeIndex umReverse; - beast::Journal j_; + beast::Journal const j_; }; } // ripple diff --git a/src/ripple/app/paths/Pathfinder.h b/src/ripple/app/paths/Pathfinder.h index e24bcb7086..6fdee019b3 100644 --- a/src/ripple/app/paths/Pathfinder.h +++ b/src/ripple/app/paths/Pathfinder.h @@ -194,7 +194,7 @@ private: hash_map mPathsOutCountMap; Application& app_; - beast::Journal j_; + beast::Journal const j_; // Add ripple paths static std::uint32_t const afADD_ACCOUNTS = 0x001; diff --git a/src/ripple/app/paths/RippleCalc.h b/src/ripple/app/paths/RippleCalc.h index a00a2dcda8..111ad68288 100644 --- a/src/ripple/app/paths/RippleCalc.h +++ b/src/ripple/app/paths/RippleCalc.h @@ -127,7 +127,7 @@ public: // Map of currency, issuer to node index. AccountIssueToNodeIndex mumSource_; - beast::Journal j_; + beast::Journal const j_; Logs& logs_; private: diff --git a/src/ripple/app/paths/cursor/PathCursor.h b/src/ripple/app/paths/cursor/PathCursor.h index 2346ce430d..cf8243671f 100644 --- a/src/ripple/app/paths/cursor/PathCursor.h +++ b/src/ripple/app/paths/cursor/PathCursor.h @@ -142,7 +142,7 @@ private: PathState& pathState_; bool multiQuality_; NodeIndex nodeIndex_; - beast::Journal j_; + beast::Journal const j_; }; } // path diff --git a/src/ripple/app/paths/impl/BookStep.cpp b/src/ripple/app/paths/impl/BookStep.cpp index 365de2d74d..18435e5b19 100644 --- a/src/ripple/app/paths/impl/BookStep.cpp +++ b/src/ripple/app/paths/impl/BookStep.cpp @@ -52,7 +52,7 @@ protected: bool const ownerPaysTransferFee_; // Mark as inactive (dry) if too many offers are consumed bool inactive_ = false; - beast::Journal j_; + beast::Journal const j_; struct Cache { diff --git a/src/ripple/app/paths/impl/DirectStep.cpp b/src/ripple/app/paths/impl/DirectStep.cpp index ba64bec926..2edb527bd2 100644 --- a/src/ripple/app/paths/impl/DirectStep.cpp +++ b/src/ripple/app/paths/impl/DirectStep.cpp @@ -44,7 +44,7 @@ protected: // Charge transfer fees when the prev step redeems Step const* const prevStep_ = nullptr; bool const isLast_; - beast::Journal j_; + beast::Journal const j_; struct Cache { diff --git a/src/ripple/app/paths/impl/Steps.h b/src/ripple/app/paths/impl/Steps.h index f7e2534a43..c147725c1e 100644 --- a/src/ripple/app/paths/impl/Steps.h +++ b/src/ripple/app/paths/impl/Steps.h @@ -505,7 +505,7 @@ struct StrandContext than once */ boost::container::flat_set& seenBookOuts; - beast::Journal j; ///< Journal for logging + beast::Journal const j; /** StrandContext constructor. */ StrandContext (ReadView const& view_, diff --git a/src/ripple/app/paths/impl/XRPEndpointStep.cpp b/src/ripple/app/paths/impl/XRPEndpointStep.cpp index a45f0440b9..a75d61c2f3 100644 --- a/src/ripple/app/paths/impl/XRPEndpointStep.cpp +++ b/src/ripple/app/paths/impl/XRPEndpointStep.cpp @@ -41,7 +41,7 @@ class XRPEndpointStep : public StepImp< private: AccountID acc_; bool const isLast_; - beast::Journal j_; + beast::Journal const j_; // Since this step will always be an endpoint in a strand // (either the first or last step) the same cache is used diff --git a/src/ripple/app/tx/impl/OfferStream.h b/src/ripple/app/tx/impl/OfferStream.h index a0d93d762a..31a17cedde 100644 --- a/src/ripple/app/tx/impl/OfferStream.h +++ b/src/ripple/app/tx/impl/OfferStream.h @@ -69,7 +69,7 @@ public: }; protected: - beast::Journal j_; + beast::Journal const j_; ApplyView& view_; ApplyView& cancelView_; Book book_; diff --git a/src/ripple/app/tx/impl/Taker.h b/src/ripple/app/tx/impl/Taker.h index 5227c53197..944c388bff 100644 --- a/src/ripple/app/tx/impl/Taker.h +++ b/src/ripple/app/tx/impl/Taker.h @@ -69,7 +69,7 @@ private: CrossType cross_type_; protected: - beast::Journal journal_; + beast::Journal const journal_; struct Flow { diff --git a/src/ripple/app/tx/impl/Transactor.h b/src/ripple/app/tx/impl/Transactor.h index 5ea9388030..e69203b657 100644 --- a/src/ripple/app/tx/impl/Transactor.h +++ b/src/ripple/app/tx/impl/Transactor.h @@ -36,7 +36,7 @@ public: STTx const& tx; Rules const rules; ApplyFlags flags; - beast::Journal j; + beast::Journal const j; PreflightContext(Application& app_, STTx const& tx_, Rules const& rules_, ApplyFlags flags_, @@ -54,7 +54,7 @@ public: TER preflightResult; STTx const& tx; ApplyFlags flags; - beast::Journal j; + beast::Journal const j; PreclaimContext(Application& app_, ReadView const& view_, TER preflightResult_, STTx const& tx_, @@ -79,7 +79,7 @@ class Transactor { protected: ApplyContext& ctx_; - beast::Journal j_; + beast::Journal const j_; AccountID account_; XRPAmount mPriorBalance; // Balance before fees. diff --git a/src/ripple/basics/impl/PerfLogImp.h b/src/ripple/basics/impl/PerfLogImp.h index 63bf20ed44..7c7eb550ee 100644 --- a/src/ripple/basics/impl/PerfLogImp.h +++ b/src/ripple/basics/impl/PerfLogImp.h @@ -133,7 +133,7 @@ class PerfLogImp }; Setup const setup_; - beast::Journal j_; + beast::Journal const j_; std::function const signalStop_; Counters counters_ {ripple::RPC::getHandlerNames(), JobTypes::instance()}; std::ofstream logFile_; diff --git a/src/ripple/consensus/Consensus.h b/src/ripple/consensus/Consensus.h index 3aa5e0db44..92bce2f4f0 100644 --- a/src/ripple/consensus/Consensus.h +++ b/src/ripple/consensus/Consensus.h @@ -597,7 +597,7 @@ private: hash_set deadNodes_; // Journal for debugging - beast::Journal j_; + beast::Journal const j_; }; template diff --git a/src/ripple/consensus/DisputedTx.h b/src/ripple/consensus/DisputedTx.h index 9361d18519..fdfb49808d 100644 --- a/src/ripple/consensus/DisputedTx.h +++ b/src/ripple/consensus/DisputedTx.h @@ -132,7 +132,7 @@ private: bool ourVote_; //< Our vote (true is yes) Tx_t tx_; //< Transaction under dispute Map_t votes_; //< Map from NodeID to vote - beast::Journal j_; + beast::Journal const j_; }; // Track a peer's yes/no vote on a particular disputed tx_ diff --git a/src/ripple/core/Config.h b/src/ripple/core/Config.h index cfe27a7d67..fca0b0f5aa 100644 --- a/src/ripple/core/Config.h +++ b/src/ripple/core/Config.h @@ -107,7 +107,7 @@ private: boost::filesystem::path DEBUG_LOGFILE; void load (); - beast::Journal j_; + beast::Journal const j_; bool QUIET = false; // Minimize logging verbosity. bool SILENT = false; // No output to console after startup. diff --git a/src/ripple/core/LoadMonitor.h b/src/ripple/core/LoadMonitor.h index 0fa48a42d5..1f3643d2d2 100644 --- a/src/ripple/core/LoadMonitor.h +++ b/src/ripple/core/LoadMonitor.h @@ -75,7 +75,7 @@ private: std::chrono::milliseconds mTargetLatencyAvg; std::chrono::milliseconds mTargetLatencyPk; UptimeClock::time_point mLastUpdate; - beast::Journal j_; + beast::Journal const j_; }; } // ripple diff --git a/src/ripple/core/impl/SNTPClock.cpp b/src/ripple/core/impl/SNTPClock.cpp index 5941f10a83..7ea904d8ca 100644 --- a/src/ripple/core/impl/SNTPClock.cpp +++ b/src/ripple/core/impl/SNTPClock.cpp @@ -87,7 +87,7 @@ private: } }; - beast::Journal j_; + beast::Journal const j_; std::mutex mutable mutex_; std::thread thread_; boost::asio::io_service io_service_; diff --git a/src/ripple/core/impl/SociDB.cpp b/src/ripple/core/impl/SociDB.cpp index 063e4b4694..71a5fce86b 100644 --- a/src/ripple/core/impl/SociDB.cpp +++ b/src/ripple/core/impl/SociDB.cpp @@ -205,7 +205,7 @@ private: JobQueue& jobQueue_; bool running_ = false; - beast::Journal j_; + beast::Journal const j_; static int sqliteWALHook ( diff --git a/src/ripple/core/impl/TimeKeeper.cpp b/src/ripple/core/impl/TimeKeeper.cpp index e96c2a7833..2e79c6e6a8 100644 --- a/src/ripple/core/impl/TimeKeeper.cpp +++ b/src/ripple/core/impl/TimeKeeper.cpp @@ -28,7 +28,7 @@ namespace ripple { class TimeKeeperImpl : public TimeKeeper { private: - beast::Journal j_; + beast::Journal const j_; std::mutex mutable mutex_; std::chrono::duration closeOffset_; std::unique_ptr clock_; diff --git a/src/ripple/net/HTTPClientSSLContext.h b/src/ripple/net/HTTPClientSSLContext.h index fe492f0ec3..e91f6329ea 100644 --- a/src/ripple/net/HTTPClientSSLContext.h +++ b/src/ripple/net/HTTPClientSSLContext.h @@ -182,7 +182,7 @@ public: private: boost::asio::ssl::context ssl_context_; - beast::Journal j_; + beast::Journal const j_; const bool verify_; }; diff --git a/src/ripple/net/SSLHTTPDownloader.h b/src/ripple/net/SSLHTTPDownloader.h index 4f8471c910..893043ce49 100644 --- a/src/ripple/net/SSLHTTPDownloader.h +++ b/src/ripple/net/SSLHTTPDownloader.h @@ -67,7 +67,7 @@ private: boost::optional< boost::asio::ssl::stream> stream_; boost::beast::flat_buffer read_buf_; - beast::Journal j_; + beast::Journal const j_; void do_session( diff --git a/src/ripple/net/impl/RPCCall.cpp b/src/ripple/net/impl/RPCCall.cpp index 0b27ae1b0d..a010791614 100644 --- a/src/ripple/net/impl/RPCCall.cpp +++ b/src/ripple/net/impl/RPCCall.cpp @@ -92,7 +92,7 @@ std::string createHTTPPost ( class RPCParser { private: - beast::Journal j_; + beast::Journal const j_; // TODO New routine for parsing ledger parameters, other routines should standardize on this. static bool jvParseLedger (Json::Value& jvRequest, std::string const& strLedger) diff --git a/src/ripple/net/impl/RPCSub.cpp b/src/ripple/net/impl/RPCSub.cpp index da52f5e986..ef509f2dcd 100644 --- a/src/ripple/net/impl/RPCSub.cpp +++ b/src/ripple/net/impl/RPCSub.cpp @@ -194,7 +194,7 @@ private: std::deque > mDeque; - beast::Journal j_; + beast::Journal const j_; Logs& logs_; }; diff --git a/src/ripple/nodestore/Database.h b/src/ripple/nodestore/Database.h index 7b59a766f8..1dde5f4df4 100644 --- a/src/ripple/nodestore/Database.h +++ b/src/ripple/nodestore/Database.h @@ -220,7 +220,7 @@ public: } protected: - beast::Journal j_; + beast::Journal const j_; Scheduler& scheduler_; int fdRequired_ {0}; diff --git a/src/ripple/nodestore/backend/MemoryFactory.cpp b/src/ripple/nodestore/backend/MemoryFactory.cpp index 3e1d0d0a31..fa121a3bfc 100644 --- a/src/ripple/nodestore/backend/MemoryFactory.cpp +++ b/src/ripple/nodestore/backend/MemoryFactory.cpp @@ -81,7 +81,7 @@ private: using Map = std::map >; std::string name_; - beast::Journal journal_; + beast::Journal const journal_; MemoryDB* db_ {nullptr}; public: diff --git a/src/ripple/nodestore/backend/NuDBFactory.cpp b/src/ripple/nodestore/backend/NuDBFactory.cpp index 3bc3228268..bf56609339 100644 --- a/src/ripple/nodestore/backend/NuDBFactory.cpp +++ b/src/ripple/nodestore/backend/NuDBFactory.cpp @@ -42,7 +42,7 @@ class NuDBBackend public: static constexpr std::size_t currentType = 1; - beast::Journal j_; + beast::Journal const j_; size_t const keyBytes_; std::string const name_; nudb::store db_; diff --git a/src/ripple/nodestore/impl/Shard.cpp b/src/ripple/nodestore/impl/Shard.cpp index 4a7544c002..2b7b5cddf2 100644 --- a/src/ripple/nodestore/impl/Shard.cpp +++ b/src/ripple/nodestore/impl/Shard.cpp @@ -39,7 +39,7 @@ Shard::Shard( Application& app, DatabaseShard const& db, std::uint32_t index, - beast::Journal& j) + beast::Journal j) : app_(app) , index_(index) , firstSeq_(db.firstLedgerSeq(index)) diff --git a/src/ripple/nodestore/impl/Shard.h b/src/ripple/nodestore/impl/Shard.h index 4a7e0228a2..687de6c20c 100644 --- a/src/ripple/nodestore/impl/Shard.h +++ b/src/ripple/nodestore/impl/Shard.h @@ -36,7 +36,9 @@ namespace NodeStore { // Removes a path in its entirety inline static bool -removeAll(boost::filesystem::path const& path, beast::Journal& j) +removeAll( + boost::filesystem::path const& path, + beast::Journal const& j) { try { @@ -70,7 +72,7 @@ public: Application& app, DatabaseShard const& db, std::uint32_t index, - beast::Journal& j); + beast::Journal j); bool open(Scheduler& scheduler, nudb::context& ctx); @@ -164,7 +166,7 @@ private: // Transaction SQLite database used for indexes std::unique_ptr txSQLiteDB_; - beast::Journal j_; + beast::Journal const j_; // True if shard has its entire ledger range stored bool complete_ {false}; diff --git a/src/ripple/overlay/impl/ConnectAttempt.h b/src/ripple/overlay/impl/ConnectAttempt.h index bf16694f0b..3c63fcf503 100644 --- a/src/ripple/overlay/impl/ConnectAttempt.h +++ b/src/ripple/overlay/impl/ConnectAttempt.h @@ -45,7 +45,7 @@ private: Application& app_; std::uint32_t const id_; beast::WrappedSink sink_; - beast::Journal journal_; + beast::Journal const journal_; endpoint_type remote_endpoint_; Resource::Consumer usage_; boost::asio::io_service::strand strand_; diff --git a/src/ripple/overlay/impl/OverlayImpl.h b/src/ripple/overlay/impl/OverlayImpl.h index 64fa2a225c..e599f569ee 100644 --- a/src/ripple/overlay/impl/OverlayImpl.h +++ b/src/ripple/overlay/impl/OverlayImpl.h @@ -106,7 +106,7 @@ private: boost::container::flat_map< Child*, std::weak_ptr> list_; Setup setup_; - beast::Journal journal_; + beast::Journal const journal_; ServerHandler& serverHandler_; Resource::Manager& m_resourceManager; std::unique_ptr m_peerFinder; diff --git a/src/ripple/overlay/impl/PeerImp.h b/src/ripple/overlay/impl/PeerImp.h index 070ab8d066..112ec2e895 100644 --- a/src/ripple/overlay/impl/PeerImp.h +++ b/src/ripple/overlay/impl/PeerImp.h @@ -106,8 +106,8 @@ private: id_t const id_; beast::WrappedSink sink_; beast::WrappedSink p_sink_; - beast::Journal journal_; - beast::Journal p_journal_; + beast::Journal const journal_; + beast::Journal const p_journal_; std::unique_ptr ssl_bundle_; socket_type& socket_; stream_type& stream_; diff --git a/src/ripple/resource/impl/ResourceManager.cpp b/src/ripple/resource/impl/ResourceManager.cpp index 30f70f8676..9e2bc7b952 100644 --- a/src/ripple/resource/impl/ResourceManager.cpp +++ b/src/ripple/resource/impl/ResourceManager.cpp @@ -36,7 +36,7 @@ namespace Resource { class ManagerImp : public Manager { private: - beast::Journal journal_; + beast::Journal const journal_; Logic logic_; std::thread thread_; bool stop_ = false; diff --git a/src/ripple/rpc/Context.h b/src/ripple/rpc/Context.h index 07e0da3f18..31c7df8e5e 100644 --- a/src/ripple/rpc/Context.h +++ b/src/ripple/rpc/Context.h @@ -47,7 +47,7 @@ struct Context boost::string_view forwardedFor; }; - beast::Journal j; + beast::Journal const j; Json::Value params; Application& app; Resource::Charge& loadType; diff --git a/src/ripple/rpc/Request.h b/src/ripple/rpc/Request.h index 87493b0e5d..0121833463 100644 --- a/src/ripple/rpc/Request.h +++ b/src/ripple/rpc/Request.h @@ -47,7 +47,7 @@ struct Request } // [in] The Journal for logging - beast::Journal journal; + beast::Journal const journal; // [in] The JSON-RPC method std::string method; diff --git a/src/ripple/rpc/ShardArchiveHandler.h b/src/ripple/rpc/ShardArchiveHandler.h index 22fef13e5f..ed7bc2a5ce 100644 --- a/src/ripple/rpc/ShardArchiveHandler.h +++ b/src/ripple/rpc/ShardArchiveHandler.h @@ -84,7 +84,7 @@ private: boost::asio::basic_waitable_timer timer_; bool process_; std::map archives_; - beast::Journal j_; + beast::Journal const j_; }; } // RPC diff --git a/src/ripple/server/impl/BaseHTTPPeer.h b/src/ripple/server/impl/BaseHTTPPeer.h index 05437182cb..5238a8d59d 100644 --- a/src/ripple/server/impl/BaseHTTPPeer.h +++ b/src/ripple/server/impl/BaseHTTPPeer.h @@ -88,7 +88,7 @@ protected: boost::asio::strand strand_; waitable_timer timer_; endpoint_type remote_address_; - beast::Journal journal_; + beast::Journal const journal_; std::string id_; std::size_t nid_; diff --git a/src/ripple/server/impl/BasePeer.h b/src/ripple/server/impl/BasePeer.h index c9c4ff501f..c860e87f2f 100644 --- a/src/ripple/server/impl/BasePeer.h +++ b/src/ripple/server/impl/BasePeer.h @@ -47,7 +47,7 @@ protected: Handler& handler_; endpoint_type remote_address_; beast::WrappedSink sink_; - beast::Journal j_; + beast::Journal const j_; boost::asio::executor_work_guard work_; boost::asio::strand strand_; diff --git a/src/ripple/server/impl/Door.h b/src/ripple/server/impl/Door.h index 7457de436b..c7756f354c 100644 --- a/src/ripple/server/impl/Door.h +++ b/src/ripple/server/impl/Door.h @@ -70,7 +70,7 @@ private: timer_type timer_; endpoint_type remote_address_; boost::asio::io_context::strand strand_; - beast::Journal j_; + beast::Journal const j_; public: Detector( @@ -88,7 +88,7 @@ private: void do_detect (yield_context yield); }; - beast::Journal j_; + beast::Journal const j_; Port const& port_; Handler& handler_; boost::asio::io_context& ioc_; diff --git a/src/ripple/server/impl/ServerImpl.h b/src/ripple/server/impl/ServerImpl.h index a1b127f921..fcd1da3d40 100644 --- a/src/ripple/server/impl/ServerImpl.h +++ b/src/ripple/server/impl/ServerImpl.h @@ -88,7 +88,7 @@ private: }; Handler& handler_; - beast::Journal j_; + beast::Journal const j_; boost::asio::io_service& io_service_; boost::asio::io_service::strand strand_; boost::optional work_;