Print stacktrace for exceptions and die upon errors.

1 files changed, 6 insertions, 3 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 9830b226c2b..ae7599add4c 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
@@ -6,13 +6,14 @@ import com.yahoo.concurrent.ThreadFactoryFactory;
 import com.yahoo.container.di.ComponentDeconstructor;
 import com.yahoo.container.di.componentgraph.Provider;
 import com.yahoo.jdisc.SharedResource;
-import com.yahoo.yolean.Exceptions;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
+import static java.util.logging.Level.WARNING;
+
 /**
 * @author tonyv
 * @author gv
@@ -59,9 +60,11 @@ public class Deconstructor implements ComponentDeconstructor {
                 component.deconstruct();
                 log.info("Finished deconstructing " + component);
             } catch (Exception e) {
-                log.warning("Exception thrown when deconstructing " + component + ": " + e.getClass().getName()
-                                    + ": " + Exceptions.toMessageString(e));
+                log.log(WARNING, "Exception thrown when deconstructing " + component, e);
+            } catch (Throwable t) {
+                com.yahoo.protect.Process.logAndDie("Error when deconstructing " + component, t);
             }
         }
+
     }
 }