diff options
author | Jan Srnicek <jsrnicek@cisco.com> | 2017-08-11 14:05:30 +0200 |
---|---|---|
committer | Marek Gradzki <mgradzki@cisco.com> | 2017-08-14 08:20:18 +0000 |
commit | 2a39a0f17d82ecf7c75840d53960c42c6ea2c6ac (patch) | |
tree | be89dcd0d219dc2ff9c928c77a4fc218458e071f /nat/nat2vpp/src/main | |
parent | 72493bf45a8823dbb2bc8e0745ebb7106a7ae01f (diff) |
HONEYCOMB-381 - Usage of ShutdownHandler for jvpp components
and notification producer
Change-Id: I70e749de5b290c84e86a28625d5ec79c98de80f2
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Diffstat (limited to 'nat/nat2vpp/src/main')
-rwxr-xr-x | nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/jvpp/JVppSnatProvider.java | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/jvpp/JVppSnatProvider.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/jvpp/JVppSnatProvider.java index e5a1b3f4d..d1a1b766c 100755 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/jvpp/JVppSnatProvider.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/jvpp/JVppSnatProvider.java @@ -18,6 +18,7 @@ package io.fd.hc2vpp.nat.jvpp; import com.google.inject.Inject; 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.snat.JVppSnatImpl; import io.fd.vpp.jvpp.snat.future.FutureJVppSnatFacade; @@ -26,8 +27,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Provides future API for jvpp-nsh plugin. Must be a singleton due to shutdown hook usage. - * Registers shutdown hook to free plugin's resources on shutdown. + * Provides future API for jvpp-nsh plugin. Must be a singleton due to shutdown hook usage. Registers shutdown hook to + * free plugin's resources on shutdown. */ public final class JVppSnatProvider extends ProviderTrait<FutureJVppSnatFacade> { @@ -36,19 +37,15 @@ public final class JVppSnatProvider extends ProviderTrait<FutureJVppSnatFacade> @Inject private JVppRegistry registry; + @Inject + private ShutdownHandler shutdownHandler; + @Override protected FutureJVppSnatFacade create() { try { final JVppSnatImpl jvppSnat = new JVppSnatImpl(); // Free jvpp-nsh plugin's resources on shutdown - Runtime.getRuntime().addShutdownHook(new Thread() { - @Override - public void run() { - LOG.info("Unloading jvpp-snat plugin"); - jvppSnat.close(); - LOG.info("Successfully unloaded jvpp-snat plugin"); - } - }); + shutdownHandler.register("jvpp-snat", jvppSnat); LOG.info("Successfully loaded jvpp-snat plugin"); return new FutureJVppSnatFacade(registry, jvppSnat); |