Optimisation

Signed-off-by: JCW <[email protected]>

Author: a1q123456

include/xrpl/beast/utility/Journal.h

@@ -79,14 +79,6 @@ operator<<(std::ostream& os, LogParameter<T> const& param);
 
 namespace beast {
 
-// Forward declaration for use in interfaces
-namespace detail {
-class SimpleJsonWriter;
-}
-
-// Type alias for journal attribute factory functions
-using JournalAttributesFactory = void(detail::SimpleJsonWriter&);
-
 namespace detail {
 
 class SimpleJsonWriter

src/xrpld/app/main/Application.cpp

@@ -831,15 +831,6 @@ class ApplicationImp : public Application, public BasicApp
     bool
     serverOkay(std::string& reason) override;
 
-    beast::Journal
-    journal(
-        std::string const& name,
-        std::function<beast::JournalAttributesFactory> const& attributes)
-        override;
-
-    beast::Journal
-    journal(std::string const& name) override;
-
     //--------------------------------------------------------------------------
 
     bool
@@ -2175,20 +2166,6 @@ ApplicationImp::serverOkay(std::string& reason)
     return true;
 }
 
-beast::Journal
-ApplicationImp::journal(
-    std::string const& name,
-    std::function<beast::JournalAttributesFactory> const& attributes)
-{
-    return logs_->journal(name, std::move(attributes));
-}
-
-beast::Journal
-ApplicationImp::journal(std::string const& name)
-{
-    return logs_->journal(name);
-}
-
 void
 ApplicationImp::setMaxDisallowedLedger()
 {

src/xrpld/app/main/Application.h

@@ -257,13 +257,18 @@ class Application : public beast::PropertyStream::Source
     virtual bool
     serverOkay(std::string& reason) = 0;
 
-    virtual beast::Journal
-    journal(
-        std::string const& name,
-        std::function<beast::JournalAttributesFactory> const& attributes) = 0;
-
-    virtual beast::Journal
-    journal(std::string const& name) = 0;
+    template <typename TAttributesFactory>
+    beast::Journal
+    journal(std::string const& name, TAttributesFactory&& factory)
+    {
+        return logs().journal(name, std::forward<TAttributesFactory>(factory));
+    }
+
+    beast::Journal
+    journal(std::string const& name)
+    {
+        return logs().journal(name);
+    }
 
     /* Returns the number of file descriptors the application needs */
     virtual int