[Libreoffice-commits] online.git: loolwsd/Log.hpp

[Ashod Nakashian]

 loolwsd/Log.hpp |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 04022563905df0cb0cf81b52babe277fc9381853
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon Oct 31 21:39:51 2016 -0400

    Log file and line number using the LOG_XXX macro
    
    Change-Id: Ie157daab8b1f52aba22e87ef07b14e571cc59771
    Reviewed-on: https://gerrit.libreoffice.org/30494
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/Log.hpp b/loolwsd/Log.hpp
index 7fe521d..64634c7 100644
--- a/loolwsd/Log.hpp
+++ b/loolwsd/Log.hpp
@@ -170,12 +170,13 @@ namespace Log
     }
 }
 
-#define LOG_TRC(X) if (Log::traceEnabled()) { std::ostringstream oss; oss << Log::prefix("TRC") << X; Log::logger().trace(oss.str()); }
-#define LOG_DBG(X) if (Log::debugEnabled()) { std::ostringstream oss; oss << Log::prefix("DBG") << X; Log::logger().debug(oss.str()); }
-#define LOG_INF(X) if (Log::infoEnabled()) { std::ostringstream oss; oss << Log::prefix("INF") << X; Log::logger().information(oss.str()); }
-#define LOG_WRN(X) if (Log::warnEnabled()) { std::ostringstream oss; oss << Log::prefix("WRN") << X; Log::logger().warning(oss.str()); }
-#define LOG_ERR(X) if (Log::errorEnabled()) { std::ostringstream oss; oss << Log::prefix("ERR") << X; Log::logger().error(oss.str()); }
-#define LOG_FTL(X) if (Log::fatalEnabled()) { std::ostringstream oss; oss << Log::prefix("FTL") << X; Log::logger().fatal(oss.str()); }
+#define LOG_BODY(LVL, X) std::ostringstream oss; oss << Log::prefix("TRC") << X << "| " << __FILE__ << ':' << __LINE__
+#define LOG_TRC(X) if (Log::traceEnabled()) { LOG_BODY("TRC", X); Log::logger().trace(oss.str()); }
+#define LOG_DBG(X) if (Log::debugEnabled()) { LOG_BODY("DBG", X); Log::logger().debug(oss.str()); }
+#define LOG_INF(X) if (Log::infoEnabled()) { LOG_BODY("INF", X); Log::logger().information(oss.str()); }
+#define LOG_WRN(X) if (Log::warnEnabled()) { LOG_BODY("WRN", X); Log::logger().warning(oss.str()); }
+#define LOG_ERR(X) if (Log::errorEnabled()) { LOG_BODY("ERR", X); Log::logger().error(oss.str()); }
+#define LOG_FTL(X) if (Log::fatalEnabled()) { LOG_BODY("FTL", X); Log::logger().fatal(oss.str()); }
 
 #endif