[Enhancement] log stack trace in FE thrift service (#47491)

Signed-off-by: stdpain <[email protected]> (cherry picked from commit 553e115) # Conflicts: # fe/fe-core/src/main/java/com/starrocks/common/Log4jConfig.java
StarRocks · Jun 26, 2024 · ccc2cf8 · ccc2cf8
1 parent f27536c
commit ccc2cf8
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/common/Log4jConfig.java b/fe/fe-core/src/main/java/com/starrocks/common/Log4jConfig.java
@@ -63,7 +63,11 @@ public class Log4jConfig extends XmlConfiguration {
             "    </RollingFile>\n" +
             "    <RollingFile name=\"SysWF\" fileName=\"${sys_log_dir}/fe.warn.log\" filePattern=\"${sys_log_dir}/fe.warn.log.${sys_file_pattern}-%i\">\n" +
             "      <PatternLayout charset=\"UTF-8\">\n" +
+<<<<<<< HEAD
             "        <Pattern>%d{yyyy-MM-dd HH:mm:ss,SSS} %p (%t|%tid) [%C{1}.%M():%L] %m%n</Pattern>\n" +
+=======
+            "        <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSSXXX} %p (%t|%tid) [%C{1}.%M():%L] %m%n %ex</Pattern>\n" +
+>>>>>>> 553e115f5b ([Enhancement] log stack trace in FE thrift service (#47491))
             "      </PatternLayout>\n" +
             "      <Policies>\n" +
             "        <TimeBasedTriggeringPolicy/>\n" +