Remove duplicate classes. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e298c1b2 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e298c1b2 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e298c1b2
Branch: refs/heads/LOG4J2-608 Commit: e298c1b254e09d84f9966f6f5f466a8186b8dc0c Parents: ab7a7a2 Author: Gary Gregory <[email protected]> Authored: Tue Sep 2 10:53:06 2014 -0400 Committer: Gary Gregory <[email protected]> Committed: Tue Sep 2 10:53:06 2014 -0400 ---------------------------------------------------------------------- .../logging/log4j/streams/ByteStreamLogger.java | 152 ------------------- .../logging/log4j/streams/CharStreamLogger.java | 110 -------------- 2 files changed, 262 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e298c1b2/log4j-streams/src/main/java/org/apache/logging/log4j/streams/ByteStreamLogger.java ---------------------------------------------------------------------- diff --git a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/ByteStreamLogger.java b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/ByteStreamLogger.java deleted file mode 100644 index 6efa138..0000000 --- a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/ByteStreamLogger.java +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.logging.log4j.streams; - -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.ByteBuffer; -import java.nio.charset.Charset; - -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.Marker; -import org.apache.logging.log4j.spi.ExtendedLogger; - -public class ByteStreamLogger { - private class ByteBufferInputStream extends InputStream { - - @Override - public int read() throws IOException { - ByteStreamLogger.this.buf.flip(); - int result = -1; - if (ByteStreamLogger.this.buf.limit() > 0) { - result = ByteStreamLogger.this.buf.get() & 0xFF; - } - ByteStreamLogger.this.buf.compact(); - return result; - } - - @Override - public int read(final byte[] bytes, final int off, final int len) throws IOException { - ByteStreamLogger.this.buf.flip(); - int result = -1; - if (ByteStreamLogger.this.buf.limit() > 0) { - result = Math.min(len, ByteStreamLogger.this.buf.limit()); - ByteStreamLogger.this.buf.get(bytes, off, result); - } - ByteStreamLogger.this.buf.compact(); - return result; - } - } - - private static final int BUFFER_SIZE = 1024; - private final ExtendedLogger logger; - private final Level level; - private final Marker marker; - private final ByteBufferInputStream in; - private final InputStreamReader reader; - private final char[] msgBuf = new char[BUFFER_SIZE]; - private final StringBuilder msg = new StringBuilder(); - private boolean closed; - - private final ByteBuffer buf = ByteBuffer.allocate(BUFFER_SIZE); - - public ByteStreamLogger(final ExtendedLogger logger, final Level level, final Marker marker, final Charset charset) { - this.logger = logger; - this.level = level; - this.marker = marker; - this.in = new ByteBufferInputStream(); - this.reader = new InputStreamReader(this.in, charset); - } - - public void close(final String fqcn) { - synchronized (this.msg) { - this.closed = true; - logEnd(fqcn); -// in.close(); - } - } - - private void extractMessages(final String fqcn) throws IOException { - if (this.closed) { - return; - } - int read = this.reader.read(this.msgBuf); - while (read > 0) { - int off = 0; - for (int pos = 0; pos < read; pos++) { - switch (this.msgBuf[pos]) { - case '\r': - this.msg.append(this.msgBuf, off, pos - off); - off = pos + 1; - break; - case '\n': - this.msg.append(this.msgBuf, off, pos - off); - off = pos + 1; - log(fqcn); - break; - } - } - this.msg.append(this.msgBuf, off, read - off); - read = this.reader.read(this.msgBuf); - } - } - - private void log(final String fqcn) { - // convert to string now so async loggers work - this.logger.logIfEnabled(fqcn, this.level, this.marker, this.msg.toString()); - this.msg.setLength(0); - } - - private void logEnd(final String fqcn) { - if (this.msg.length() > 0) { - log(fqcn); - } - } - - public void put(final String fqcn, final byte[] b, final int off, final int len) throws IOException { - int curLen = len; - int curOff = off; - if (curLen >= 0) { - synchronized (this.msg) { - while (curLen > this.buf.remaining()) { - final int remaining = this.buf.remaining(); - this.buf.put(b, curOff, remaining); - curLen -= remaining; - curOff += remaining; - extractMessages(fqcn); - } - this.buf.put(b, curOff, curLen); - extractMessages(fqcn); - } - } else { - logEnd(fqcn); - } - } - - public void put(final String fqcn, final int b) throws IOException { - if (b >= 0) { - synchronized (this.msg) { - this.buf.put((byte) (b & 0xFF)); - extractMessages(fqcn); - } - } else { - logEnd(fqcn); - } - } -} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e298c1b2/log4j-streams/src/main/java/org/apache/logging/log4j/streams/CharStreamLogger.java ---------------------------------------------------------------------- diff --git a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/CharStreamLogger.java b/log4j-streams/src/main/java/org/apache/logging/log4j/streams/CharStreamLogger.java deleted file mode 100644 index b46cf85..0000000 --- a/log4j-streams/src/main/java/org/apache/logging/log4j/streams/CharStreamLogger.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.logging.log4j.streams; - -import java.nio.CharBuffer; - -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.Marker; -import org.apache.logging.log4j.spi.ExtendedLogger; - -public class CharStreamLogger { - private final ExtendedLogger logger; - private final Level level; - private final Marker marker; - private final StringBuilder msg = new StringBuilder(); - private boolean closed = false; - - public CharStreamLogger(final ExtendedLogger logger, final Level level, final Marker marker) { - this.logger = logger; - this.level = level; - this.marker = marker; - } - - public void close(final String fqcn) { - synchronized (this.msg) { - this.closed = true; - logEnd(fqcn); - } - } - - private void log(final String fqcn) { - this.logger.logIfEnabled(fqcn, this.level, this.marker, this.msg.toString()); // convert to string now so async loggers - // work - this.msg.setLength(0); - } - - private void logEnd(final String fqcn) { - if (this.msg.length() > 0) { - log(fqcn); - } - } - - public void put(final String fqcn, final char[] cbuf, final int off, final int len) { - put(fqcn, CharBuffer.wrap(cbuf), off, len); - } - - public void put(final String fqcn, final CharSequence str, final int off, final int len) { - if (len >= 0) { - synchronized (this.msg) { - if (this.closed) { - return; - } - int start = off; - final int end = off + len; - for (int pos = off; pos < end; pos++) { - final char c = str.charAt(pos); - switch (c) { - case '\r': - case '\n': - this.msg.append(str, start, pos); - start = pos + 1; - if (c == '\n') { - log(fqcn); - } - break; - } - } - this.msg.append(str, start, end); - } - } else { - logEnd(fqcn); - } - } - - public void put(final String fqcn, final int c) { - if (c >= 0) { - synchronized (this.msg) { - if (this.closed) { - return; - } - switch (c) { - case '\n': - log(fqcn); - break; - case '\r': - break; - default: - this.msg.append((char) c); - } - } - } else { - logEnd(fqcn); - } - } -}
