Merge remote-tracking branch 'upstream/dev' into sync-2.4.0

include/xrpl/basics/Log.h

@@ -253,13 +253,22 @@ private:
 // Wraps a Journal::Stream to skip evaluation of
 // expensive argument lists if the stream is not active.
 #ifndef JLOG
+#ifdef BEAST_ENHANCED_LOGGING
 #define JLOG(x) \
-    if (!x)     \
+    if (!(x))   \
+    {           \
+    }           \
+    else        \
+        (x).withLocation(__FILE__, __LINE__)
+#else
+#define JLOG(x) \
+    if (!(x))   \
     {           \
     }           \
     else        \
         x
 #endif
+#endif
 
 #ifndef CLOG
 #define CLOG(ss) \