Repository: logging-log4j2 Updated Branches: refs/heads/master 14e27b4b8 -> 8901ffc46
Include exceptions when logging FATAL events in org.apache.logging.log4j.core.LoggerContext.setUpShutdownHook() Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8901ffc4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8901ffc4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8901ffc4 Branch: refs/heads/master Commit: 8901ffc46472670f15fe9e8f606546689435dbe2 Parents: 14e27b4 Author: ggregory <ggreg...@apache.org> Authored: Fri Jul 17 16:42:55 2015 -0700 Committer: ggregory <ggreg...@apache.org> Committed: Fri Jul 17 16:42:55 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/core/LoggerContext.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8901ffc4/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java index 3d91b0e..9072717 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java @@ -190,10 +190,10 @@ public class LoggerContext extends AbstractLifeCycle implements org.apache.loggi return "Shutdown callback for LoggerContext[name=" + LoggerContext.this.getName() + ']'; } }); - } catch (final IllegalStateException ise) { - LOGGER.fatal(SHUTDOWN_HOOK_MARKER, "Unable to register shutdown hook because JVM is shutting down."); - } catch (final SecurityException se) { - LOGGER.error(SHUTDOWN_HOOK_MARKER, "Unable to register shutdown hook due to security restrictions"); + } catch (final IllegalStateException e) { + LOGGER.fatal(SHUTDOWN_HOOK_MARKER, "Unable to register shutdown hook because JVM is shutting down.", e); + } catch (final SecurityException e) { + LOGGER.error(SHUTDOWN_HOOK_MARKER, "Unable to register shutdown hook due to security restrictions", e); } } }