This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 71edd74 CAMEL-15036: Make it easier to use supervising route
controller
71edd74 is described below
commit 71edd74b22d7cbcf706b2b8017175b78528033d4
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon May 11 11:45:26 2020 +0200
CAMEL-15036: Make it easier to use supervising route controller
---
.../camel/main/MainConfigurationPropertiesConfigurer.java | 11 ++++++-----
.../resources/META-INF/camel-main-configuration-metadata.json | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git
a/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
b/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
index fb8125f..810f174 100644
---
a/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
+++
b/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
@@ -7,6 +7,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.spi.GeneratedPropertyConfigurer;
import org.apache.camel.spi.PropertyConfigurerGetter;
import org.apache.camel.util.CaseInsensitiveMap;
+import org.apache.camel.main.MainConfigurationProperties;
/**
* Generated by camel build tools - do NOT edit this file!
@@ -114,14 +115,14 @@ public class MainConfigurationPropertiesConfigurer
extends org.apache.camel.supp
case "RouteControllerBackOffMaxElapsedTime":
target.setRouteControllerBackOffMaxElapsedTime(property(camelContext,
long.class, value)); return true;
case "routecontrollerbackoffmultiplier":
case "RouteControllerBackOffMultiplier":
target.setRouteControllerBackOffMultiplier(property(camelContext, double.class,
value)); return true;
- case "routecontrollerenabled":
- case "RouteControllerEnabled":
target.setRouteControllerSuperviseEnabled(property(camelContext, boolean.class,
value)); return true;
case "routecontrollerexcluderoutes":
case "RouteControllerExcludeRoutes":
target.setRouteControllerExcludeRoutes(property(camelContext,
java.lang.String.class, value)); return true;
case "routecontrollerincluderoutes":
case "RouteControllerIncludeRoutes":
target.setRouteControllerIncludeRoutes(property(camelContext,
java.lang.String.class, value)); return true;
case "routecontrollerinitialdelay":
case "RouteControllerInitialDelay":
target.setRouteControllerInitialDelay(property(camelContext, long.class,
value)); return true;
+ case "routecontrollersuperviseenabled":
+ case "RouteControllerSuperviseEnabled":
target.setRouteControllerSuperviseEnabled(property(camelContext, boolean.class,
value)); return true;
case "routecontrollerthreadpoolsize":
case "RouteControllerThreadPoolSize":
target.setRouteControllerThreadPoolSize(property(camelContext, int.class,
value)); return true;
case "routefilterexcludepattern":
@@ -235,10 +236,10 @@ public class MainConfigurationPropertiesConfigurer
extends org.apache.camel.supp
answer.put("RouteControllerBackOffMaxDelay", long.class);
answer.put("RouteControllerBackOffMaxElapsedTime", long.class);
answer.put("RouteControllerBackOffMultiplier", double.class);
- answer.put("RouteControllerEnabled", boolean.class);
answer.put("RouteControllerExcludeRoutes", java.lang.String.class);
answer.put("RouteControllerIncludeRoutes", java.lang.String.class);
answer.put("RouteControllerInitialDelay", long.class);
+ answer.put("RouteControllerSuperviseEnabled", boolean.class);
answer.put("RouteControllerThreadPoolSize", int.class);
answer.put("RouteFilterExcludePattern", java.lang.String.class);
answer.put("RouteFilterIncludePattern", java.lang.String.class);
@@ -371,14 +372,14 @@ public class MainConfigurationPropertiesConfigurer
extends org.apache.camel.supp
case "RouteControllerBackOffMaxElapsedTime": return
target.getRouteControllerBackOffMaxElapsedTime();
case "routecontrollerbackoffmultiplier":
case "RouteControllerBackOffMultiplier": return
target.getRouteControllerBackOffMultiplier();
- case "routecontrollerenabled":
- case "RouteControllerEnabled": return
target.isRouteControllerSuperviseEnabled();
case "routecontrollerexcluderoutes":
case "RouteControllerExcludeRoutes": return
target.getRouteControllerExcludeRoutes();
case "routecontrollerincluderoutes":
case "RouteControllerIncludeRoutes": return
target.getRouteControllerIncludeRoutes();
case "routecontrollerinitialdelay":
case "RouteControllerInitialDelay": return
target.getRouteControllerInitialDelay();
+ case "routecontrollersuperviseenabled":
+ case "RouteControllerSuperviseEnabled": return
target.isRouteControllerSuperviseEnabled();
case "routecontrollerthreadpoolsize":
case "RouteControllerThreadPoolSize": return
target.getRouteControllerThreadPoolSize();
case "routefilterexcludepattern":
diff --git
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
index 84236ae..09f05e7 100644
---
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
+++
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
@@ -55,10 +55,10 @@
{ "name": "camel.main.routeControllerBackOffMaxDelay", "description":
"Backoff maximum delay in millis when restarting a route that failed to
startup.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "integer",
"javaType": "long" },
{ "name": "camel.main.routeControllerBackOffMaxElapsedTime",
"description": "Backoff maximum elapsed time in millis, after which the backoff
should be considered exhausted and no more attempts should be made.",
"sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type":
"integer", "javaType": "long" },
{ "name": "camel.main.routeControllerBackOffMultiplier", "description":
"Backoff multiplier to use for exponential backoff. This is used to extend the
delay between restart attempts.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "number",
"javaType": "double" },
- { "name": "camel.main.routeControllerEnabled", "description": "To enable
using supervising route controller which allows Camel to startup and then the
controller takes care of starting the routes in a safe manner. This can be used
when you want to startup Camel despite a route may otherwise fail fast during
startup and cause Camel to fail to startup as well. By delegating the route
startup to the supervising route controller then its manages the startup using
a background thread. The [...]
{ "name": "camel.main.routeControllerExcludeRoutes", "description":
"Pattern for filtering routes to be included as supervised. The pattern is
matching on route id, and endpoint uri for the route. Multiple patterns can be
separated by comma. For example to include all kafka routes, you can say
kafka:. And to include routes with specific route ids myRoute,myOtherRoute. The
pattern supports wildcards and uses the matcher from
org.apache.camel.support.PatternHelper#matchPattern.", "sour [...]
{ "name": "camel.main.routeControllerIncludeRoutes", "description":
"Pattern for filtering routes to be excluded as supervised. The pattern is
matching on route id, and endpoint uri for the route. Multiple patterns can be
separated by comma. For example to exclude all JMS routes, you can say jms:.
And to exclude routes with specific route ids
mySpecialRoute,myOtherSpecialRoute. The pattern supports wildcards and uses the
matcher from org.apache.camel.support.PatternHelper#matchPatter [...]
{ "name": "camel.main.routeControllerInitialDelay", "description":
"Initial delay in milli seconds before the route controller starts, after
CamelContext has been started.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "integer",
"javaType": "long" },
+ { "name": "camel.main.routeControllerSuperviseEnabled", "description": "To
enable using supervising route controller which allows Camel to startup and
then the controller takes care of starting the routes in a safe manner. This
can be used when you want to startup Camel despite a route may otherwise fail
fast during startup and cause Camel to fail to startup as well. By delegating
the route startup to the supervising route controller then its manages the
startup using a background th [...]
{ "name": "camel.main.routeControllerThreadPoolSize", "description": "The
number of threads used by the route controller scheduled thread pool that are
used for restarting routes. The pool uses 1 thread by default, but you can
increase this to allow the controller to concurrently attempt to restart
multiple routes in case more than one route has problems starting.",
"sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type":
"integer", "javaType": "int" },
{ "name": "camel.main.routeFilterExcludePattern", "description": "Used for
filtering routes routes matching the given pattern, which follows the following
rules: - Match by route id - Match by route input endpoint uri The matching is
using exact match, by wildcard and regular expression as documented by
PatternHelper#matchPattern(String,String) . For example to only include routes
which starts with foo in their route id's, use: include=foo* And to exclude
routes which starts from [...]
{ "name": "camel.main.routeFilterIncludePattern", "description": "Used for
filtering routes routes matching the given pattern, which follows the following
rules: - Match by route id - Match by route input endpoint uri The matching is
using exact match, by wildcard and regular expression as documented by
PatternHelper#matchPattern(String,String) . For example to only include routes
which starts with foo in their route id's, use: include=foo* And to exclude
routes which starts from [...]
