Skip to content

remove leftover routes after gracefully shutdown routes using startup order #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skin27 merged 1 commit into from
Feb 14, 2025
Merged

remove leftover routes after gracefully shutdown routes using startup order #369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions integration/src/main/java/org/assimbly/integration/impl/CamelIntegration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1541,13 +1541,28 @@ public String stopFlow(String id, long timeout, boolean enableReport) {
}

try {

// gracefully shutdown routes using startup order
List<RouteStartupOrder> routeStartupOrders = getRoutesStartupOrderByFlowId(id);
context.getShutdownStrategy().shutdown(context,routeStartupOrders,timeout,TimeUnit.MILLISECONDS);
context.getShutdownStrategy().shutdown(context, routeStartupOrders, timeout, TimeUnit.MILLISECONDS);
for(RouteStartupOrder routeStartupOrder : routeStartupOrders){
context.removeRoute(routeStartupOrder.getRoute().getId());
}

// remove leftover routes
List<String> leftoverRoutes = getAllRoutesByFlowId(id);
if (!leftoverRoutes.isEmpty()) {
for (String routeId : leftoverRoutes) {
try {
if (context.getRoute(routeId) != null) {
context.getRouteController().stopRoute(routeId);
context.removeRoute(routeId);
}
} catch (Exception e) {
System.out.println("Error removing leftover route " + routeId + ": " + e.getMessage());
}
}
}

if(enableReport) {
finishFlowActionReport(id, "stop", "Stopped flow successfully", "info");
}
Expand Down Expand Up @@ -3416,11 +3431,18 @@ private List<Route> getRoutesByFlowId(String id){
}

private List<RouteStartupOrder> getRoutesStartupOrderByFlowId(String id){

List<RouteStartupOrder> routeStartupOrder = context.getCamelContextExtension().getRouteStartupOrder();
return routeStartupOrder.stream().filter(r -> r.getRoute().getId().startsWith(id)).collect(Collectors.toList());
}

private List<String> getAllRoutesByFlowId(String id) {
List<String> leftoverRouteIds = context.getRoutes().stream()
.map(Route::getId)
.filter(routeId -> routeId.startsWith(id))
.collect(Collectors.toList());
return leftoverRouteIds;
}

private String getKeystorePassword() {
String keystorePwd = System.getenv(KEYSTORE_PWD);
if(StringUtils.isEmpty(keystorePwd)) {
Expand Down