From ca2ab5da59c60d09f204bfeb102e8d0a5b60085e Mon Sep 17 00:00:00 2001
From: Mingyu Chen <morningman@163.com>
Date: Wed, 30 Jan 2019 21:28:42 +0800
Subject: [PATCH] Add more thrift log (#605)

---
 be/src/service/doris_main.cpp                          |  8 ++++++++
 .../main/java/org/apache/doris/common/Log4jConfig.java | 10 ++++++++--
 .../org/apache/doris/service/FrontendServiceImpl.java  |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/be/src/service/doris_main.cpp b/be/src/service/doris_main.cpp
index e2152e6713..ceec930eb7 100644
--- a/be/src/service/doris_main.cpp
+++ b/be/src/service/doris_main.cpp
@@ -31,6 +31,7 @@
 #endif
 
 #include <curl/curl.h>
+#include <thrift/TOutput.h>
 
 #include "common/logging.h"
 #include "common/daemon.h"
@@ -64,6 +65,11 @@ extern "C" { void __lsan_do_leak_check(); }
 
 namespace doris {
 extern bool k_doris_exit;
+
+static void thrift_output(const char* x) {
+    LOG(WARNING) << "thrift internal message: " << x;
+}
+
 }
 
 int main(int argc, char** argv) {
@@ -134,6 +140,8 @@ int main(int argc, char** argv) {
         LOG(FATAL) << "fail to initialize libcurl, curl_ret=" << curl_ret;
         exit(-1);
     }
+    // add logger for thrift internal
+    apache::thrift::GlobalOutput.setOutputFunction(doris::thrift_output);
 
     doris::init_daemon(argc, argv, paths);
 
diff --git a/fe/src/main/java/org/apache/doris/common/Log4jConfig.java b/fe/src/main/java/org/apache/doris/common/Log4jConfig.java
index 086c7295e1..a0f51fdc88 100644
--- a/fe/src/main/java/org/apache/doris/common/Log4jConfig.java
+++ b/fe/src/main/java/org/apache/doris/common/Log4jConfig.java
@@ -81,8 +81,14 @@ public class Log4jConfig extends XmlConfiguration {
             "<Logger name='audit' level='ERROR' additivity='false'>" + 
                 "<AppenderRef ref='Auditfile'/>" + 
             "</Logger>" + 
-            "<Logger name='org.apache.thrift.transport' level='DEBUG'>\n" +
-            "    <AppenderRef ref='Sys'/>\n" +
+            "<Logger name='org.apache.thrift' level='DEBUG'>" +
+            "    <AppenderRef ref='Sys'/>" +
+            "</Logger>" +
+            "<Logger name='org.apache.thrift.transport' level='DEBUG'>" +
+            "    <AppenderRef ref='Sys'/>" +
+            "</Logger>" +
+            "<Logger name='org.apache.doris.thrift' level='DEBUG'>" +
+            "    <AppenderRef ref='Sys'/>" +
             "</Logger>" +
             "<!--REPLACED BY AUDIT AND VERBOSE MODULE NAMES-->" + 
         "</Loggers>" + 
diff --git a/fe/src/main/java/org/apache/doris/service/FrontendServiceImpl.java b/fe/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
index 13ea7f31c5..068d0de459 100644
--- a/fe/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
+++ b/fe/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
@@ -375,7 +375,7 @@ public class FrontendServiceImpl implements FrontendService.Iface {
             ConnectContext.remove();
         }
 
-        LOG.debug("mini load result: {}", request);
+        LOG.debug("mini load result: {}", result);
         return result;
     }