diff --git a/include/xrpl/basics/Log.h b/include/xrpl/basics/Log.h index 5ba31f89f0..3b801f4beb 100644 --- a/include/xrpl/basics/Log.h +++ b/include/xrpl/basics/Log.h @@ -206,7 +206,7 @@ public: write( beast::severities::Severity level, std::string const& partition, - std::string text, + std::string const& text, bool console); std::string @@ -244,7 +244,7 @@ public: static void format( std::string& output, - std::string message, + std::string const& message, beast::severities::Severity severity, std::string const& partition); diff --git a/include/xrpl/beast/utility/Journal.h b/include/xrpl/beast/utility/Journal.h index f54b57815e..9e73f279dd 100644 --- a/include/xrpl/beast/utility/Journal.h +++ b/include/xrpl/beast/utility/Journal.h @@ -97,7 +97,7 @@ enum Severity { kNone = kDisabled }; -std::string +std::string_view to_string(Severity severity); } // namespace severities diff --git a/src/libxrpl/basics/Log.cpp b/src/libxrpl/basics/Log.cpp index a87d9bb315..a699183221 100644 --- a/src/libxrpl/basics/Log.cpp +++ b/src/libxrpl/basics/Log.cpp @@ -200,11 +200,11 @@ void Logs::write( beast::severities::Severity level, std::string const& partition, - std::string text, + std::string const& text, bool console) { std::string s; - format(s, std::move(text), level, partition); + format(s, text, level, partition); file_.writeln(s); if (!silent_) std::cerr << s << '\n'; @@ -332,14 +332,14 @@ Logs::fromString(std::string const& s) void Logs::format( std::string& output, - std::string message, + std::string const& message, beast::severities::Severity severity, std::string const& partition) { - output = std::move(message); + output = message; if (!beast::Journal::isStructuredJournalEnabled()) { - output.reserve(message.size() + partition.size() + 100); + output.reserve(output.size() + partition.size() + 100); output += to_string(std::chrono::system_clock::now()); output += " "; diff --git a/src/libxrpl/beast/utility/beast_Journal.cpp b/src/libxrpl/beast/utility/beast_Journal.cpp index 04e286b8db..1c5f7ed7df 100644 --- a/src/libxrpl/beast/utility/beast_Journal.cpp +++ b/src/libxrpl/beast/utility/beast_Journal.cpp @@ -98,7 +98,7 @@ Journal::getNullSink() //------------------------------------------------------------------------------ -std::string +std::string_view severities::to_string(Severity severity) { switch (severity) @@ -185,7 +185,7 @@ Journal::JsonLogContext::reset( value = threadIdStream.str(); } }; - thread_local ThreadIdStringInitializer threadId; + thread_local ThreadIdStringInitializer const threadId; attributes_.SetObject(); if (globalLogAttributes_.has_value())