Don't shut down full actor system when the JVM exists ( this affects actors running on other hosts ).
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/4275db0c Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/4275db0c Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/4275db0c Branch: refs/heads/master Commit: 4275db0c7adba6e904b46bdd451d87e8277c2933 Parents: f73ce4a Author: Michael Russo <[email protected]> Authored: Wed Aug 31 21:24:23 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Wed Aug 31 21:24:23 2016 -0700 ---------------------------------------------------------------------- .../persistence/actorsystem/ActorSystemManagerImpl.java | 12 ++++++------ .../java/org/apache/usergrid/rest/ShutdownListener.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/4275db0c/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java b/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java index 8dcb550..3f00327 100644 --- a/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java +++ b/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java @@ -349,12 +349,12 @@ public class ActorSystemManagerImpl implements ActorSystemManager { } // add a shutdown hook to clean all actor systems if the JVM exits without the servlet container knowing - Runtime.getRuntime().addShutdownHook(new Thread() { - @Override - public void run() { - shutdownAll(); - } - }); +// Runtime.getRuntime().addShutdownHook(new Thread() { +// @Override +// public void run() { +// shutdownAll(); +// } +// }); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/4275db0c/stack/rest/src/main/java/org/apache/usergrid/rest/ShutdownListener.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/ShutdownListener.java b/stack/rest/src/main/java/org/apache/usergrid/rest/ShutdownListener.java index f9f1653..f3707a7 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/ShutdownListener.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/ShutdownListener.java @@ -72,7 +72,7 @@ public class ShutdownListener implements ServletContextListener { ActorSystemManager actorSystemManager = injector.getInstance(ActorSystemManager.class); // stop the Akka actor system - actorSystemManager.shutdownAll(); + //actorSystemManager.shutdownAll(); boolean started = Boolean.parseBoolean( properties.getProperty(JobServiceBoostrap.START_SCHEDULER_PROP, "true"));
