X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FCmsStateImpl.java;h=b493c08ef3cb923d286444d96e96b8e1c1fdc4ab;hb=33920c58e7946ff85b72c2ff513eb8ee4d2e1aa8;hp=cf203e5e61bacf4de33bd5c1c4f182682d06611e;hpb=0ffddd13968b41b26caddfcf17b3dc86a58eb776;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java index cf203e5e6..b493c08ef 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java @@ -3,8 +3,6 @@ package org.argeo.cms.internal.runtime; import java.net.InetAddress; import java.net.URL; import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.List; import javax.security.auth.login.Configuration; @@ -29,13 +27,13 @@ public class CmsStateImpl implements CmsState { private Long availableSince; // private ThreadGroup threadGroup = new ThreadGroup("CMS"); - private List stopHooks = new ArrayList<>(); +// private List stopHooks = new ArrayList<>(); private String stateUuid; // private final boolean cleanState; private String hostname; - public void init() { + public void start() { // instance = this; Runtime.getRuntime().addShutdownHook(new CmsShutdown()); @@ -177,18 +175,19 @@ public class CmsStateImpl implements CmsState { // log.debug("Initialised default Bitronix transaction manager"); // } - public void destroy() { + public void stop() { if (log.isDebugEnabled()) log.debug("CMS stopping... (" + this.stateUuid + ")"); +// new GogoShellKiller().start(); // In a different thread in order to avoid interruptions - Thread stopHookThread = new Thread(() -> applyStopHooks(), "Apply Argeo Stop Hooks"); - stopHookThread.start(); - try { - stopHookThread.join(10 * 60 * 1000); - } catch (InterruptedException e) { - // silent - } +// Thread stopHookThread = new Thread(() -> applyStopHooks(), "Apply Argeo Stop Hooks"); +// stopHookThread.start(); +// try { +// stopHookThread.join(10 * 60 * 1000); +// } catch (InterruptedException e) { +// // silent +// } // internalExecutorService.shutdown(); @@ -197,19 +196,19 @@ public class CmsStateImpl implements CmsState { } /** Apply shutdown hoos in reverse order. */ - private void applyStopHooks() { - for (int i = stopHooks.size() - 1; i >= 0; i--) { - try { - stopHooks.get(i).run(); - } catch (Exception e) { - log.error("Could not run shutdown hook #" + i); - } - } - // Clean hanging Gogo shell thread - new GogoShellKiller().start(); - -// instance = null; - } +// private void applyStopHooks() { +//// for (int i = stopHooks.size() - 1; i >= 0; i--) { +//// try { +//// stopHooks.get(i).run(); +//// } catch (Exception e) { +//// log.error("Could not run shutdown hook #" + i); +//// } +//// } +// // Clean hanging Gogo shell thread +// new GogoShellKiller().start(); +// +//// instance = null; +// } // @Override // public boolean isClean() {