From 9659d28f1083f8ce9c67db3fb708f5b96740fba4 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 7 Mar 2018 14:51:18 +0100 Subject: Move shutdown hook registration to dedicated provider This change would allow using ShutdownHandlerImpl in integration tests. Change-Id: I854f65d03b9e1a495fda7211fd1b7fd51b4e5ba3 Signed-off-by: Marek Gradzki --- .../data/ConfigAndOperationalPipelineModule.java | 2 +- .../infra/distro/data/ShutdownHandlerProvider.java | 31 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ShutdownHandlerProvider.java (limited to 'infra/minimal-distribution-core/src') diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java index 080caaf81..d0cbdc1db 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java @@ -47,7 +47,7 @@ public class ConfigAndOperationalPipelineModule extends PrivateModule { @Override protected void configure() { - bind(ShutdownHandler.class).to(ShutdownHandlerImpl.class).in(Singleton.class); + bind(ShutdownHandler.class).toProvider(ShutdownHandlerProvider.class).in(Singleton.class); expose(ShutdownHandler.class); // Mount point service is required by notification service and restconf diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ShutdownHandlerProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ShutdownHandlerProvider.java new file mode 100644 index 000000000..0c649b0da --- /dev/null +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ShutdownHandlerProvider.java @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.fd.honeycomb.infra.distro.data; + +import io.fd.honeycomb.binding.init.ProviderTrait; +import io.fd.honeycomb.data.init.ShutdownHandler; +import io.fd.honeycomb.impl.ShutdownHandlerImpl; + +public class ShutdownHandlerProvider extends ProviderTrait { + @Override + protected ShutdownHandler create() { + final ShutdownHandler handler = new ShutdownHandlerImpl(); + // Make sure ShutdownHandler is run on JVM shutdown + Runtime.getRuntime().addShutdownHook(new Thread((handler::performShutdown))); + return handler; + } +} -- cgit 1.2.3-korg