Skip to content

Commit

Permalink
Support UTF8 in remote node execution fixes #222 (via brighteye)
Browse files Browse the repository at this point in the history
  • Loading branch information
gschueler committed Dec 2, 2014
1 parent f802480 commit 4842604
Showing 1 changed file with 11 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,26 @@ import com.dtolabs.rundeck.core.logging.StreamingLogWriter

/**
* Thread local buffered log output
* 解决rundeck中文log乱码的问题,此文件在rundeck源文件路径:./rundeckapp/src/groovy/com/dtolabs/rundeck/app/internal/logging/ThreadBoundLogOutputStream.groovy
* yeml#ucweb.com
*/
class ThreadBoundLogOutputStream extends OutputStream {
StreamingLogWriter logger
LogLevel level
Contextual contextual
ThreadLocal<StringBuilder> sb = new ThreadLocal<StringBuilder>()
ThreadLocal<Date> time = new ThreadLocal<Date>()
ThreadLocal<Map> context = new ThreadLocal<Map>()
ThreadLocal<Boolean> crchar = new ThreadLocal<Boolean>()
ThreadLocal<ByteArrayOutputStream> baos = new ThreadLocal<ByteArrayOutputStream>()

ThreadBoundLogOutputStream(StreamingLogWriter logger, LogLevel level, Contextual contextual) {
this.logger = logger
this.level = level
this.contextual = contextual
}

public void write(final int b) {
if (sb.get() == null) {
if (baos.get() == null) {
createEventBuffer()
}
if (b == '\n') {
Expand All @@ -37,34 +40,34 @@ class ThreadBoundLogOutputStream extends OutputStream {
crchar.set(false);
createEventBuffer()
}
sb.get().append((char) b)
baos.get().write((byte) b)
}

}

private void createEventBuffer() {
time.set(new Date())
context.set(contextual.getContext())
sb.set(new StringBuilder())
baos.set(new ByteArrayOutputStream())
}

private void flushEventBuffer() {
def buffer = sb.get()
def buffer = baos.get()
logger.addEvent(
new DefaultLogEvent(
loglevel: level,
metadata: context.get() ?: [:],
message: buffer ? buffer.toString() : '',
message: buffer ? new String(buffer.toByteArray()) : '',
datetime: time.get() ?: new Date(),
eventType: LogUtil.EVENT_TYPE_LOG)
)
sb.set(null)
time.set(null)
context.set(null)
baos.set(null)
}

public void flush() {
if (sb.get().size() > 0) {
if (baos.get() != null && baos.get().size() > 0) {
flushEventBuffer();
}
}
Expand Down

0 comments on commit 4842604

Please sign in to comment.