From e4139584aaf94df71a4ddb5e5a0dded1a80c249d Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Tue, 18 Apr 2017 09:52:15 +0200 Subject: HC2VPP-106 - jvpp timeout configuration Allows dynamic configuration of jvpp timeout Change-Id: Iab113ec33f1efd8d150f0e525ef548a64ebf1a0b Signed-off-by: Jan Srnicek --- .../common/integration/JVppTimeoutProvider.java | 37 ++++++++++++++++++++++ .../hc2vpp/common/integration/VppCommonModule.java | 1 + .../common/integration/VppConfigAttributes.java | 3 ++ .../honeycomb-minimal-resources/config/jvpp.json | 3 +- 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppTimeoutProvider.java (limited to 'vpp-common/vpp-common-integration/src/main') diff --git a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppTimeoutProvider.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppTimeoutProvider.java new file mode 100644 index 000000000..ce260326d --- /dev/null +++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/JVppTimeoutProvider.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2017 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.hc2vpp.common.integration; + +import com.google.inject.Inject; +import com.google.inject.Provider; +import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; + +class JVppTimeoutProvider implements Provider { + + @Inject + private VppConfigAttributes configAttributes; + + @Override + public JVppTimeoutInit get() { + JvppReplyConsumer.JvppReplyTimeoutHolder.setupTimeout(configAttributes.jvppRequestTimeout); + return new JVppTimeoutInit() { + }; + } + + interface JVppTimeoutInit { + } +} diff --git a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppCommonModule.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppCommonModule.java index c7a1cc9f5..4da2d9a13 100644 --- a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppCommonModule.java +++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppCommonModule.java @@ -35,6 +35,7 @@ public final class VppCommonModule extends AbstractModule { bind(VppStatusListener.class).toInstance(new VppStatusListener()); bind(JVppRegistry.class).toProvider(JVppRegistryProvider.class).in(Singleton.class); bind(FutureJVppCore.class).toProvider(JVppCoreProvider.class).in(Singleton.class); + bind(JVppTimeoutProvider.JVppTimeoutInit.class).toProvider(JVppTimeoutProvider.class).asEagerSingleton(); // Naming contexts reader exposing context storage over REST/HONEYCOMB_NETCONF final Multibinder readerBinder = Multibinder.newSetBinder(binder(), ReaderFactory.class); diff --git a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppConfigAttributes.java b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppConfigAttributes.java index 7ac53e63b..9c351cb7c 100644 --- a/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppConfigAttributes.java +++ b/vpp-common/vpp-common-integration/src/main/java/io/fd/hc2vpp/common/integration/VppConfigAttributes.java @@ -25,4 +25,7 @@ public class VppConfigAttributes { @InjectConfig("jvpp-connection-name") public String jvppConnectionName; + + @InjectConfig("jvpp-request-timeout") + public int jvppRequestTimeout; } diff --git a/vpp-common/vpp-common-integration/src/main/resources/honeycomb-minimal-resources/config/jvpp.json b/vpp-common/vpp-common-integration/src/main/resources/honeycomb-minimal-resources/config/jvpp.json index 1d411872e..efd1cd66e 100644 --- a/vpp-common/vpp-common-integration/src/main/resources/honeycomb-minimal-resources/config/jvpp.json +++ b/vpp-common/vpp-common-integration/src/main/resources/honeycomb-minimal-resources/config/jvpp.json @@ -1,3 +1,4 @@ { - "jvpp-connection-name": "honeycomb" + "jvpp-connection-name": "honeycomb", + "jvpp-request-timeout":5 } \ No newline at end of file -- cgit 1.2.3-korg