Added retryAfterSeconds configuration option

morph166955 · Jan 31, 2021 · d073e87 · d073e87
1 parent 280c322
commit d073e87
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/bundles/org.jupnp/src/main/java/org/jupnp/DefaultUpnpServiceConfiguration.java b/bundles/org.jupnp/src/main/java/org/jupnp/DefaultUpnpServiceConfiguration.java
@@ -173,7 +173,7 @@ public GENAEventProcessor getGenaEventProcessor() {
     @Override
     @SuppressWarnings("rawtypes")
     public StreamClient createStreamClient() {
-        return transportConfiguration.createStreamClient(getSyncProtocolExecutorService("upnp-stream"));
+        return transportConfiguration.createStreamClient(getSyncProtocolExecutorService("upnp-stream"),-1);
     }
 
     @Override

diff --git a/bundles/org.jupnp/src/main/java/org/jupnp/OSGiUpnpServiceConfiguration.java b/bundles/org.jupnp/src/main/java/org/jupnp/OSGiUpnpServiceConfiguration.java
@@ -96,6 +96,8 @@ public class OSGiUpnpServiceConfiguration implements UpnpServiceConfiguration {
     private boolean asyncThreadPool = true;
     private boolean mainThreadPool = true;
     private Namespace callbackURI = new Namespace("http://localhost/upnpcallback");
+    private int retryAfterSeconds = -1;
+    private int maxRequests = -1;
 
     private ExecutorService mainExecutorService;
     private ExecutorService asyncExecutorService;
@@ -199,7 +201,7 @@ public GENAEventProcessor getGenaEventProcessor() {
     @Override
     @SuppressWarnings("rawtypes")
     public StreamClient createStreamClient() {
-        return transportConfiguration.createStreamClient(getSyncProtocolExecutorService("upnp-stream"));
+        return transportConfiguration.createStreamClient(getSyncProtocolExecutorService("upnp-stream"),retryAfterSeconds);
     }
 
     @Override
@@ -535,6 +537,18 @@ private void createConfiguration(Map<String, Object> properties) throws Configur
         } else if (prop instanceof Integer) {
             httpProxyPort = (Integer) prop;
         }
+
+        prop = properties.get("retryAfterSeconds");
+        if (prop instanceof String) {
+            try {
+                retryAfterSeconds = Integer.valueOf((String) prop);
+            } catch (NumberFormatException e) {
+                log.error("Invalid value '{}' for retryAfterSeconds - using default value", prop);
+            }
+        } else if (prop instanceof Integer) {
+            retryAfterSeconds = (Integer) prop;
+        }
+        log.info("OSGiUpnpServiceConfiguration createConfiguration retryAfterSeconds = {}", retryAfterSeconds);
     }
 
 }
diff --git a/bundles/org.jupnp/src/main/java/org/jupnp/transport/TransportConfiguration.java b/bundles/org.jupnp/src/main/java/org/jupnp/transport/TransportConfiguration.java
@@ -37,7 +37,7 @@ public interface TransportConfiguration<SCC extends StreamClientConfiguration, S
      * @param executorService used to dispatch request/response processing.
      * @return created {@link StreamClient}
      */
-    StreamClient<SCC> createStreamClient(final ExecutorService executorService);
+    StreamClient<SCC> createStreamClient(final ExecutorService executorService, int retryAfterSeconds);
 
     /**
      * Creates a {@link StreamServer} using the given {@code listenerPort}.

diff --git a/...s/org.jupnp/src/main/java/org/jupnp/transport/impl/jetty/JettyTransportConfiguration.java b/...s/org.jupnp/src/main/java/org/jupnp/transport/impl/jetty/JettyTransportConfiguration.java
@@ -19,12 +19,12 @@ public class JettyTransportConfiguration
     public static final TransportConfiguration INSTANCE = new JettyTransportConfiguration();
 
     @Override
-    public StreamClient createStreamClient(final ExecutorService executorService) {
-        return new JettyStreamClientImpl(
-                new StreamClientConfigurationImpl(
-                        executorService
-                )
-        );
+    public StreamClient createStreamClient(final ExecutorService executorService, int retryAfterSeconds) {
+        StreamClientConfigurationImpl clientConfiguration = new StreamClientConfigurationImpl(executorService);
+        if (retryAfterSeconds >= 0) {
+            clientConfiguration.setRetryAfterSeconds(retryAfterSeconds);
+        }
+        return new JettyStreamClientImpl(clientConfiguration);
     }
 
     @Override