Fix BEAST_ENHANCED_LOGGING not working and restore original behavior

.github/workflows/xahau-ga-nix.yml

@@ -375,15 +375,3 @@ jobs:
              echo "Error: rippled executable not found in ${{ env.build_dir }}"
              exit 1
           fi
-
-      - name: Export server definitions
-        run: |
-          ${{ env.build_dir }}/rippled --definitions | python3 -m json.tool > server_definitions.json
-
-      - name: Upload server definitions
-        if: matrix.compiler_id == 'gcc-13-libstdcxx'
-        uses: actions/upload-artifact@v7
-        with:
-          name: server-definitions
-          path: server_definitions.json
-          archive: false

cmake/RippledCore.cmake

@@ -68,6 +68,17 @@ target_link_libraries(xrpl.imports.main
     $<$<BOOL:${voidstar}>:antithesis-sdk-cpp>
 )
 
+# date-tz for enhanced logging (always linked, code is #ifdef guarded)
+if(TARGET date::date-tz)
+  target_link_libraries(xrpl.imports.main INTERFACE date::date-tz)
+endif()
+
+# BEAST_ENHANCED_LOGGING: enable for Debug builds OR when explicitly requested
+# Uses generator expression so it works with multi-config generators (Xcode, VS, Ninja Multi-Config)
+target_compile_definitions(xrpl.imports.main INTERFACE
+  $<$<OR:$<CONFIG:Debug>,$<BOOL:${BEAST_ENHANCED_LOGGING}>>:BEAST_ENHANCED_LOGGING=1>
+)
+
 include(add_module)
 include(target_link_modules)
 

src/xrpld/app/main/Main.cpp

@@ -24,7 +24,6 @@
 #include <xrpld/core/TimeKeeper.h>
 #include <xrpld/net/RPCCall.h>
 #include <xrpld/rpc/RPCHandler.h>
-#include <xrpld/rpc/handlers/Handlers.h>
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/basics/contract.h>
@@ -388,8 +387,7 @@ run(int argc, char** argv)
          po::value<std::string>(),
          "Specify the range of present ledgers for testing purposes. Min and "
          "max values are comma separated.")(
-            "version", "Display the build version.")(
-            "definitions", "Output server definitions as JSON and exit.");
+            "version", "Display the build version.");
 
     po::options_description data("Ledger/Data Options");
     data.add_options()("import", importText.c_str())(
@@ -531,13 +529,6 @@ run(int argc, char** argv)
         return 0;
     }
 
-    if (vm.count("definitions"))
-    {
-        auto defs = getStaticServerDefinitions();
-        std::cout << Json::FastWriter().write(defs);
-        return 0;
-    }
-
 #ifndef ENABLE_TESTS
     if (vm.count("unittest") || vm.count("unittest-child"))
     {

src/xrpld/rpc/handlers/Handlers.h

@@ -129,8 +129,6 @@ doRipplePathFind(RPC::JsonContext&);
 Json::Value
 doServerDefinitions(RPC::JsonContext&);
 Json::Value
-getStaticServerDefinitions();
-Json::Value
 doServerInfo(RPC::JsonContext&);  // for humans
 Json::Value
 doServerState(RPC::JsonContext&);  // for machines

src/xrpld/rpc/handlers/ServerDefinitions.cpp

@@ -523,15 +523,6 @@ public:
     }
 };
 
-Json::Value
-getStaticServerDefinitions()
-{
-    static const Definitions defs{};
-    Json::Value ret = defs();
-    ret[jss::hash] = to_string(defs.getHash());
-    return ret;
-}
-
 Json::Value
 doServerDefinitions(RPC::JsonContext& context)
 {