From 2a39a0f17d82ecf7c75840d53960c42c6ea2c6ac Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Fri, 11 Aug 2017 14:05:30 +0200 Subject: HONEYCOMB-381 - Usage of ShutdownHandler for jvpp components and notification producer Change-Id: I70e749de5b290c84e86a28625d5ec79c98de80f2 Signed-off-by: Jan Srnicek --- .../src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java') diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java index be8c48894..96e26a4e3 100644 --- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java +++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/JVppAclProvider.java @@ -19,6 +19,7 @@ package io.fd.hc2vpp.acl; import com.google.inject.Inject; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.honeycomb.binding.init.ProviderTrait; +import io.fd.honeycomb.data.init.ShutdownHandler; import io.fd.vpp.jvpp.JVppRegistry; import io.fd.vpp.jvpp.VppBaseCallException; import io.fd.vpp.jvpp.acl.JVppAclImpl; @@ -37,24 +38,20 @@ class JVppAclProvider extends ProviderTrait implements Jvpp @Inject private JVppRegistry registry; - private static JVppAclImpl initAclApi() { + @Inject + private ShutdownHandler shutdownHandler; + + private static JVppAclImpl initAclApi(final ShutdownHandler shutdownHandler) { final JVppAclImpl jvppAcl = new JVppAclImpl(); // Free jvpp-acl plugin's resources on shutdown - Runtime.getRuntime().addShutdownHook(new Thread() { - @Override - public void run() { - LOG.info("Unloading jvpp-acl plugin"); - jvppAcl.close(); - LOG.info("Successfully unloaded jvpp-acl plugin"); - } - }); + shutdownHandler.register("jvpp-acl", jvppAcl); return jvppAcl; } @Override protected FutureJVppAclFacade create() { try { - return reportVersionAndGet(initAclApi()); + return reportVersionAndGet(initAclApi(shutdownHandler)); } catch (IOException e) { throw new IllegalStateException("Unable to open VPP management connection", e); } catch (TimeoutException | VppBaseCallException e) { -- cgit 1.2.3-korg