diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-03-01 11:07:01 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-03-01 11:07:01 +0100 |
commit | 9f348b96dbedeafe2a743eeb835d24339075e69a (patch) | |
tree | bcb686d0d279c57c633ab83b5c42c420f950f269 /container-disc/src | |
parent | 9ee6394e974bc2e7e233cb9ddd29d684297959da (diff) |
Clearer shutdown message and handle evilness
Diffstat (limited to 'container-disc/src')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java b/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java index b2784dfef60..b103e485832 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java @@ -83,7 +83,11 @@ public class Deconstructor implements ComponentDeconstructor { catch (InterruptedException exception) { log.log(WARNING, "Randomized wait before dying disrupted. Dying now."); } - com.yahoo.protect.Process.logAndDie("Error when deconstructing " + component, e); + com.yahoo.protect.Process.logAndDie("Shutting down due to error when deconstructing " + + component, e); + } + catch (Throwable e) { + log.log(WARNING, "Non-error not exception throwable thrown when deconstructing " + component, e); } } } |