diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java b/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java index 6a461d309a20741b277b6713fdcaa9df7ad2f33e..ee11a542fed5b17084d1df0a433945b69f8ab03d 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java @@ -38,9 +38,6 @@ public class PrimingResource implements OrderedResource { public void afterRestore(Context<? extends Resource> context) throws Exception { ServletUtil.CALC_EXECUTOR.shutdown(); ServletUtil.TASK_EXECUTOR.shutdown(); - ServletUtil.CALC_EXECUTOR = - MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(ServletUtil.THREAD_COUNT)); - ServletUtil.TASK_EXECUTOR = Executors.newSingleThreadExecutor(); } private void updateParameter() throws SsmException { diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java b/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java index d031f0920c0332abd79d2cd58a1c40fec80c074c..28bba593110d8c51d802eef995fea6ce076d805f 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java @@ -102,12 +102,14 @@ public class ServletUtil { @EventListener void shutdown(ShutdownEvent event) { + System.out.println("on shutdown"); CALC_EXECUTOR.shutdown(); TASK_EXECUTOR.shutdown(); } @EventListener void startup(StartupEvent event) { + System.out.println("on start up"); if (!awsRuntime.isPresent()) { HAZARD_MODEL = loadModel(modelPath); }