From 70aaeea88499a167d818681ee425aab32c8677aa Mon Sep 17 00:00:00 2001 From: Brandon Clayton <bclayton@usgs.gov> Date: Wed, 15 Jan 2025 16:54:12 -0700 Subject: [PATCH] test --- .../java/gov/usgs/earthquake/nshmp/www/PrimingResource.java | 3 --- src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) 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 6a461d30..ee11a542 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 d031f092..28bba593 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); } -- GitLab