From 9f348b96dbedeafe2a743eeb835d24339075e69a Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Thu, 1 Mar 2018 11:07:01 +0100 Subject: Clearer shutdown message and handle evilness --- .../java/com/yahoo/container/jdisc/component/Deconstructor.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'container-disc') 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); } } } -- cgit v1.2.3