Fix issues

Author: a1q123456

include/xrpl/beast/utility/Journal.h

@@ -21,13 +21,14 @@
 #define BEAST_UTILITY_JOURNAL_H_INCLUDED
 
 #include <xrpl/beast/utility/instrumentation.h>
+
 #include <rapidjson/document.h>
 
 #include <deque>
-#include <utility>
+#include <optional>
 #include <source_location>
 #include <sstream>
-
+#include <utility>
 
 namespace ripple::log {
 template <typename T>
@@ -75,7 +76,7 @@ operator<<(std::ostream& os, LogField<T> const& param);
 template <typename T>
 std::ostream&
 operator<<(std::ostream& os, LogParameter<T> const& param);
-}
+}  // namespace ripple::log
 
 namespace beast {
 
@@ -117,7 +118,9 @@ class Journal
 public:
     template <typename T>
     friend std::ostream&
-    ripple::log::operator<<(std::ostream& os, ripple::log::LogField<T> const& param);
+    ripple::log::operator<<(
+        std::ostream& os,
+        ripple::log::LogField<T> const& param);
 
     template <typename T>
     friend std::ostream&
@@ -198,17 +201,18 @@ class Journal
 
     static thread_local JsonLogContext currentJsonLogContext_;
 
-
     // Invariant: m_sink always points to a valid Sink
     Sink* m_sink = nullptr;
 
     static void
     initMessageContext(std::source_location location);
 
     static std::string
-    formatLog(std::string const& message,
+    formatLog(
+        std::string const& message,
         severities::Severity severity,
         std::optional<JsonLogAttributes> const& attributes = std::nullopt);
+
 public:
     //--------------------------------------------------------------------------
 
@@ -300,10 +304,7 @@ class Journal
     {
     public:
         ScopedStream(ScopedStream const& other)
-            : ScopedStream(
-                  other.m_attributes,
-                  other.m_sink,
-                  other.m_level)
+            : ScopedStream(other.m_attributes, other.m_sink, other.m_level)
         {
         }
 
@@ -390,10 +391,7 @@ class Journal
 
         /** Construct or copy another Stream. */
         Stream(Stream const& other)
-            : Stream(
-                  other.m_attributes,
-                  other.m_sink,
-                  other.m_level)
+            : Stream(other.m_attributes, other.m_sink, other.m_level)
         {
         }
 
@@ -471,8 +469,7 @@ class Journal
             if (m_attributes.has_value())
                 m_attributes = JsonLogAttributes::combine(
                     other.m_attributes->contextValues_,
-                    m_attributes->contextValues_
-                );
+                    m_attributes->contextValues_);
             else
                 m_attributes = other.m_attributes;
         }
@@ -521,8 +518,7 @@ class Journal
     Stream
     stream(Severity level) const
     {
-        return Stream(
-            m_attributes, *m_sink, level);
+        return Stream(m_attributes, *m_sink, level);
     }
 
     /** Returns `true` if any message would be logged at this severity level.
@@ -542,67 +538,49 @@ class Journal
     {
         if (m_jsonLogsEnabled)
             initMessageContext(location);
-        return {
-            m_attributes,
-            *m_sink,
-            severities::kTrace};
+        return {m_attributes, *m_sink, severities::kTrace};
     }
 
     Stream
     debug(std::source_location location = std::source_location::current()) const
     {
         if (m_jsonLogsEnabled)
             initMessageContext(location);
-        return {
-            m_attributes,
-            *m_sink,
-            severities::kDebug};
+        return {m_attributes, *m_sink, severities::kDebug};
     }
 
     Stream
     info(std::source_location location = std::source_location::current()) const
     {
         if (m_jsonLogsEnabled)
             initMessageContext(location);
-        return {
-            m_attributes,
-            *m_sink,
-            severities::kInfo};
+        return {m_attributes, *m_sink, severities::kInfo};
     }
 
     Stream
     warn(std::source_location location = std::source_location::current()) const
     {
-        const char* a = "a";
+        char const* a = "a";
         rapidjson::Value v{a, 1};
         if (m_jsonLogsEnabled)
             initMessageContext(location);
-        return {
-            m_attributes,
-            *m_sink,
-            severities::kWarning};
+        return {m_attributes, *m_sink, severities::kWarning};
     }
 
     Stream
     error(std::source_location location = std::source_location::current()) const
     {
         if (m_jsonLogsEnabled)
             initMessageContext(location);
-        return {
-            m_attributes,
-            *m_sink,
-            severities::kError};
+        return {m_attributes, *m_sink, severities::kError};
     }
 
     Stream
     fatal(std::source_location location = std::source_location::current()) const
     {
         if (m_jsonLogsEnabled)
             initMessageContext(location);
-        return {
-            m_attributes,
-            *m_sink,
-            severities::kFatal};
+        return {m_attributes, *m_sink, severities::kFatal};
     }
     /** @} */
 
@@ -614,7 +592,9 @@ class Journal
         {
             globalLogAttributes_ = JsonLogAttributes{};
         }
-        globalLogAttributes_ = JsonLogAttributes::combine(globalLogAttributes_->contextValues(), globalLogAttributes.contextValues());
+        globalLogAttributes_ = JsonLogAttributes::combine(
+            globalLogAttributes_->contextValues(),
+            globalLogAttributes.contextValues());
     }
 };
 
@@ -725,12 +705,12 @@ using logwstream = basic_logstream<wchar_t>;
 
 }  // namespace beast
 
-
 namespace ripple::log {
 
 namespace detail {
 template <typename T>
-void setJsonValue(
+void
+setJsonValue(
     rapidjson::Value& object,
     rapidjson::MemoryPoolAllocator<>& allocator,
     char const* name,
@@ -739,7 +719,10 @@ void setJsonValue(
 {
     using ValueType = std::decay_t<T>;
     rapidjson::Value jsonValue;
-    if constexpr (std::constructible_from<rapidjson::Value, ValueType, rapidjson::MemoryPoolAllocator<>&>)
+    if constexpr (std::constructible_from<
+                      rapidjson::Value,
+                      ValueType,
+                      rapidjson::MemoryPoolAllocator<>&>)
     {
         jsonValue = rapidjson::Value{value, allocator};
         if (outStream)
@@ -777,12 +760,9 @@ void setJsonValue(
     }
 
     object.AddMember(
-        rapidjson::StringRef(name),
-        std::move(jsonValue),
-        allocator
-    );
-}
+        rapidjson::StringRef(name), std::move(jsonValue), allocator);
 }
+}  // namespace detail
 
 template <typename T>
 std::ostream&
@@ -793,7 +773,9 @@ operator<<(std::ostream& os, LogParameter<T> const& param)
     detail::setJsonValue(
         beast::Journal::currentJsonLogContext_.messageParams,
         beast::Journal::currentJsonLogContext_.allocator,
-        param.name_, param.value_, &os);
+        param.name_,
+        param.value_,
+        &os);
     return os;
 }
 
@@ -806,7 +788,9 @@ operator<<(std::ostream& os, LogField<T> const& param)
     detail::setJsonValue(
         beast::Journal::currentJsonLogContext_.messageParams,
         beast::Journal::currentJsonLogContext_.allocator,
-        param.name_, param.value_, nullptr);
+        param.name_,
+        param.value_,
+        nullptr);
     return os;
 }
 
@@ -824,17 +808,19 @@ field(char const* name, T&& value)
     return LogField<T>{name, std::forward<T>(value)};
 }
 
-template<typename... Pair>
+template <typename... Pair>
 [[nodiscard]] beast::Journal::JsonLogAttributes
 attributes(Pair&&... pairs)
 {
     beast::Journal::JsonLogAttributes result;
 
     (detail::setJsonValue(
-        result.contextValues(),
-        result.allocator(),
-        pairs.first,
-        pairs.second, nullptr), ...);
+         result.contextValues(),
+         result.allocator(),
+         pairs.first,
+         pairs.second,
+         nullptr),
+     ...);
 
     return result;
 }
@@ -846,6 +832,6 @@ attr(char const* name, T&& value)
     return std::make_pair(name, std::forward<T>(value));
 }
 
-}
+}  // namespace ripple::log
 
 #endif

include/xrpl/server/detail/BasePeer.h

@@ -84,12 +84,12 @@ BasePeer<Handler, Impl>::BasePeer(
     , handler_(handler)
     , remote_address_(remote_address)
     , j_(journal,
-         log::attributes(
-             log::attr("PeerID",
-               [] {
-                   static std::atomic<unsigned> id{0};
-                   return "##" + std::to_string(++id) + " ";
-               }())))
+         log::attributes(log::attr(
+             "PeerID",
+             [] {
+                 static std::atomic<unsigned> id{0};
+                 return "##" + std::to_string(++id) + " ";
+             }())))
     , work_(executor)
     , strand_(executor)
 {

src/libxrpl/beast/utility/beast_Journal.cpp

@@ -20,14 +20,14 @@
 #include <xrpl/beast/utility/Journal.h>
 
 #include <rapidjson/document.h>
-#include <rapidjson/writer.h>
 #include <rapidjson/stringbuffer.h>
+#include <rapidjson/writer.h>
 
-#include <thread>
-#include <ranges>
 #include <ios>
 #include <ostream>
+#include <ranges>
 #include <string>
+#include <thread>
 
 namespace beast {
 
@@ -151,8 +151,7 @@ Journal::JsonLogAttributes::setModuleName(std::string const& name)
     contextValues_.AddMember(
         rapidjson::StringRef("Module"),
         rapidjson::Value{name.c_str(), allocator_},
-        allocator_
-    );
+        allocator_);
 }
 
 Journal::JsonLogAttributes
@@ -166,7 +165,7 @@ Journal::JsonLogAttributes::combine(
 
     for (auto& member : b.GetObject())
     {
-        auto val = rapidjson::Value{ member.value, result.allocator_ };
+        auto val = rapidjson::Value{member.value, result.allocator_};
         if (result.contextValues_.HasMember(member.name))
         {
             result.contextValues_[member.name] = std::move(val);
@@ -206,7 +205,8 @@ Journal::formatLog(
 
     if (globalLogAttributes_)
     {
-        for (auto const& [key, value] : globalLogAttributes_->contextValues().GetObject())
+        for (auto const& [key, value] :
+             globalLogAttributes_->contextValues().GetObject())
         {
             rapidjson::Value jsonValue;
             jsonValue.CopyFrom(value, currentJsonLogContext_.allocator);

src/test/core/Coroutine_test.cpp

@@ -178,7 +178,6 @@ class Coroutine_test : public beast::unit_test::suite
     void
     test_yield_and_stop()
     {
-
         using namespace std::chrono_literals;
         using namespace jtx;
 
@@ -230,7 +229,10 @@ class Coroutine_test : public beast::unit_test::suite
         try
         {
             th.join();
-        } catch (const std::exception& e) {}
+        }
+        catch (std::exception const& e)
+        {
+        }
         pass();
     }