From d6ae469b761ad815477dd33614eeffd6559da2ee Mon Sep 17 00:00:00 2001 From: wusheng Date: Sun, 31 Jul 2016 16:32:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA=E5=8C=BA?= =?UTF-8?q?=E5=88=AB=E9=94=99=E8=AF=AF=E5=92=8C=E6=99=AE=E9=80=9A=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=82=E5=9C=A8console=E8=BE=93=E5=87=BA=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97=E4=BD=BF=E7=94=A8?= =?UTF-8?q?system.err=E8=BE=93=E5=87=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/cloud/skywalking/logging/IWriter.java | 2 ++ .../main/java/com/ai/cloud/skywalking/logging/Logger.java | 8 ++++++-- .../com/ai/cloud/skywalking/logging/STDOutWriter.java | 5 +++++ .../com/ai/cloud/skywalking/logging/SyncFileWriter.java | 5 +++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/IWriter.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/IWriter.java index 3188d2a40..cc22ccc14 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/IWriter.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/IWriter.java @@ -2,4 +2,6 @@ package com.ai.cloud.skywalking.logging; public interface IWriter { void write(String message); + + void writeError(String message); } diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/Logger.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/Logger.java index 5b6353f40..bb14d8841 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/Logger.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/Logger.java @@ -23,11 +23,15 @@ public class Logger { StackTraceElement locations[] = dummyException.getStackTrace(); if (locations != null && locations.length > 2) { - WriterFactory.getLogWriter().write(formatMessage(level, message, locations[2])); + if(ERROR.equals(level) || WARN.equals(level)){ + WriterFactory.getLogWriter().writeError(formatMessage(level, message, locations[2])); + }else { + WriterFactory.getLogWriter().write(formatMessage(level, message, locations[2])); + } } if (e != null) { - WriterFactory.getLogWriter().write(LoggingUtil.fetchThrowableStack(e)); + WriterFactory.getLogWriter().writeError(LoggingUtil.fetchThrowableStack(e)); } } diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/STDOutWriter.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/STDOutWriter.java index 9e88ed613..ee620d800 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/STDOutWriter.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/STDOutWriter.java @@ -5,6 +5,11 @@ public class STDOutWriter implements IWriter { @Override public void write(String message) { + System.out.println(message); + } + + @Override + public void writeError(String message) { System.err.println(message); } } diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/SyncFileWriter.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/SyncFileWriter.java index dbb6bbf9d..37b946468 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/SyncFileWriter.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/SyncFileWriter.java @@ -48,6 +48,11 @@ public class SyncFileWriter implements IWriter { switchLogFileIfNecessary(); } + @Override + public void writeError(String message) { + this.write(message); + } + private void writeLogRecord(String message) { try { os.write(message.getBytes());