Merge pull request #45 from royalhuang/issue_39

feat: 日志统一输出流 #39 修复日志错误流问题

Author: irwinsun

src/main/java/org/slf4j/impl/SimpleLogger.java

@@ -142,7 +142,7 @@ public class SimpleLogger extends MarkerIgnoringBase {
     private static boolean SHOW_THREAD_NAME = false;
     private static boolean SHOW_LOG_NAME = false;
     private static boolean SHOW_SHORT_LOG_NAME = false;
-    private static String LOG_FILE = "System.err";
+    private static String LOG_FILE = "System.out";
     private static PrintStream TARGET_STREAM = null;
     private static boolean LEVEL_IN_BRACKETS = false;
     private static String WARN_LEVEL_STRING = "WARN";

src/main/kotlin/com/tencent/bk/devops/plugin/script/CommandLineUtils.kt

@@ -33,7 +33,21 @@ object CommandLineUtils {
                 result.append(tmpLine).append("\n")
             }
         }
-        executor.streamHandler = PumpStreamHandler(outputStream)
+
+        val errorStream = object : LogOutputStream() {
+            override fun processLine(line: String?, level: Int) {
+                if (line == null) {
+                    return
+                }
+
+                val tmpLine = SensitiveLineParser.onParseLine(prefix + line)
+                if (print2Logger) {
+                    logger.error(tmpLine)
+                }
+                result.append(tmpLine).append("\n")
+            }
+        }
+        executor.streamHandler = PumpStreamHandler(outputStream, errorStream)
 
         try {
             val exitCode = executor.execute(cmdLine)