You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/05/08 14:03:55 UTC
[2/2] logging-log4j2 git commit: LOG4J2-1324 renamed async logger
exception handler classes
LOG4J2-1324 renamed async logger exception handler 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/d00c38dd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d00c38dd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d00c38dd
Branch: refs/heads/master
Commit: d00c38dddf6a3c90a29c14a73ba1f9e56bbbf0b9
Parents: e1e43fe
Author: rpopma <rp...@apache.org>
Authored: Sun May 8 22:56:03 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun May 8 22:56:03 2016 +0900
----------------------------------------------------------------------
...syncLoggerConfigDefaultExceptionHandler.java | 54 ++++++++++++++++++++
.../AsyncLoggerDefaultExceptionHandler.java | 52 +++++++++++++++++++
...efaultAsyncLoggerConfigExceptionHandler.java | 54 --------------------
.../DefaultAsyncLoggerExceptionHandler.java | 52 -------------------
.../logging/log4j/core/async/DisruptorUtil.java | 8 +--
5 files changed, 110 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d00c38dd/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDefaultExceptionHandler.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDefaultExceptionHandler.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDefaultExceptionHandler.java
new file mode 100644
index 0000000..fa647c6
--- /dev/null
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDefaultExceptionHandler.java
@@ -0,0 +1,54 @@
+/*
+ * 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.core.async;
+
+import com.lmax.disruptor.ExceptionHandler;
+
+/**
+ * Default disruptor exception handler for errors that occur in the AsyncLogger background thread.
+ */
+public class AsyncLoggerConfigDefaultExceptionHandler
+ implements ExceptionHandler<AsyncLoggerConfigDisruptor.Log4jEventWrapper> {
+
+ @Override
+ public void handleEventException(final Throwable throwable, final long sequence,
+ final AsyncLoggerConfigDisruptor.Log4jEventWrapper event) {
+ StringBuilder sb = new StringBuilder(512);
+ sb.append("AsyncLogger error handling event seq=").append(sequence).append(", value='");
+ try {
+ sb.append(event);
+ } catch (Exception ignored) {
+ sb.append("[ERROR calling ").append(event.getClass()).append(".toString(): ");
+ sb.append(ignored).append("]");
+ }
+ sb.append("':");
+ System.err.println(sb);
+ throwable.printStackTrace();
+ }
+
+ @Override
+ public void handleOnStartException(final Throwable throwable) {
+ System.err.println("AsyncLogger error starting:");
+ throwable.printStackTrace();
+ }
+
+ @Override
+ public void handleOnShutdownException(final Throwable throwable) {
+ System.err.println("AsyncLogger error shutting down:");
+ throwable.printStackTrace();
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d00c38dd/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDefaultExceptionHandler.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDefaultExceptionHandler.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDefaultExceptionHandler.java
new file mode 100644
index 0000000..081a097
--- /dev/null
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDefaultExceptionHandler.java
@@ -0,0 +1,52 @@
+/*
+ * 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.core.async;
+
+import com.lmax.disruptor.ExceptionHandler;
+
+/**
+ * Default disruptor exception handler for errors that occur in the AsyncLogger background thread.
+ */
+public class AsyncLoggerDefaultExceptionHandler implements ExceptionHandler<RingBufferLogEvent> {
+
+ @Override
+ public void handleEventException(final Throwable throwable, final long sequence, final RingBufferLogEvent event) {
+ StringBuilder sb = new StringBuilder(512);
+ sb.append("AsyncLogger error handling event seq=").append(sequence).append(", value='");
+ try {
+ sb.append(event);
+ } catch (Exception ignored) {
+ sb.append("[ERROR calling ").append(event.getClass()).append(".toString(): ");
+ sb.append(ignored).append("]");
+ }
+ sb.append("':");
+ System.err.println(sb);
+ throwable.printStackTrace();
+ }
+
+ @Override
+ public void handleOnStartException(final Throwable throwable) {
+ System.err.println("AsyncLogger error starting:");
+ throwable.printStackTrace();
+ }
+
+ @Override
+ public void handleOnShutdownException(final Throwable throwable) {
+ System.err.println("AsyncLogger error shutting down:");
+ throwable.printStackTrace();
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d00c38dd/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncLoggerConfigExceptionHandler.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncLoggerConfigExceptionHandler.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncLoggerConfigExceptionHandler.java
deleted file mode 100644
index 2b1612a..0000000
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncLoggerConfigExceptionHandler.java
+++ /dev/null
@@ -1,54 +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.core.async;
-
-import com.lmax.disruptor.ExceptionHandler;
-
-/**
- * Default disruptor exception handler for errors that occur in the AsyncLogger background thread.
- */
-public class DefaultAsyncLoggerConfigExceptionHandler
- implements ExceptionHandler<AsyncLoggerConfigDisruptor.Log4jEventWrapper> {
-
- @Override
- public void handleEventException(final Throwable throwable, final long sequence,
- final AsyncLoggerConfigDisruptor.Log4jEventWrapper event) {
- StringBuilder sb = new StringBuilder(512);
- sb.append("AsyncLogger error handling event seq=").append(sequence).append(", value='");
- try {
- sb.append(event);
- } catch (Exception ignored) {
- sb.append("[ERROR calling ").append(event.getClass()).append(".toString(): ");
- sb.append(ignored).append("]");
- }
- sb.append("':");
- System.err.println(sb);
- throwable.printStackTrace();
- }
-
- @Override
- public void handleOnStartException(final Throwable throwable) {
- System.err.println("AsyncLogger error starting:");
- throwable.printStackTrace();
- }
-
- @Override
- public void handleOnShutdownException(final Throwable throwable) {
- System.err.println("AsyncLogger error shutting down:");
- throwable.printStackTrace();
- }
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d00c38dd/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncLoggerExceptionHandler.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncLoggerExceptionHandler.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncLoggerExceptionHandler.java
deleted file mode 100644
index 48dea13..0000000
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncLoggerExceptionHandler.java
+++ /dev/null
@@ -1,52 +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.core.async;
-
-import com.lmax.disruptor.ExceptionHandler;
-
-/**
- * Default disruptor exception handler for errors that occur in the AsyncLogger background thread.
- */
-public class DefaultAsyncLoggerExceptionHandler implements ExceptionHandler<RingBufferLogEvent> {
-
- @Override
- public void handleEventException(final Throwable throwable, final long sequence, final RingBufferLogEvent event) {
- StringBuilder sb = new StringBuilder(512);
- sb.append("AsyncLogger error handling event seq=").append(sequence).append(", value='");
- try {
- sb.append(event);
- } catch (Exception ignored) {
- sb.append("[ERROR calling ").append(event.getClass()).append(".toString(): ");
- sb.append(ignored).append("]");
- }
- sb.append("':");
- System.err.println(sb);
- throwable.printStackTrace();
- }
-
- @Override
- public void handleOnStartException(final Throwable throwable) {
- System.err.println("AsyncLogger error starting:");
- throwable.printStackTrace();
- }
-
- @Override
- public void handleOnShutdownException(final Throwable throwable) {
- System.err.println("AsyncLogger error shutting down:");
- throwable.printStackTrace();
- }
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d00c38dd/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorUtil.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorUtil.java
index 8fb00c4..774a1cc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorUtil.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorUtil.java
@@ -96,7 +96,7 @@ final class DisruptorUtil {
static ExceptionHandler<RingBufferLogEvent> getAsyncLoggerExceptionHandler() {
final String cls = PropertiesUtil.getProperties().getStringProperty("AsyncLogger.ExceptionHandler");
if (cls == null) {
- return new DefaultAsyncLoggerExceptionHandler();
+ return new AsyncLoggerDefaultExceptionHandler();
}
try {
@SuppressWarnings("unchecked")
@@ -105,14 +105,14 @@ final class DisruptorUtil {
return klass.newInstance();
} catch (final Exception ignored) {
LOGGER.debug("Invalid AsyncLogger.ExceptionHandler value: error creating {}: ", cls, ignored);
- return new DefaultAsyncLoggerExceptionHandler();
+ return new AsyncLoggerDefaultExceptionHandler();
}
}
static ExceptionHandler<AsyncLoggerConfigDisruptor.Log4jEventWrapper> getAsyncLoggerConfigExceptionHandler() {
final String cls = PropertiesUtil.getProperties().getStringProperty("AsyncLoggerConfig.ExceptionHandler");
if (cls == null) {
- return new DefaultAsyncLoggerConfigExceptionHandler();
+ return new AsyncLoggerConfigDefaultExceptionHandler();
}
try {
@SuppressWarnings("unchecked")
@@ -121,7 +121,7 @@ final class DisruptorUtil {
return klass.newInstance();
} catch (final Exception ignored) {
LOGGER.debug("Invalid AsyncLoggerConfig.ExceptionHandler value: error creating {}: ", cls, ignored);
- return new DefaultAsyncLoggerConfigExceptionHandler();
+ return new AsyncLoggerConfigDefaultExceptionHandler();
}
}