You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gz...@apache.org on 2017/05/31 07:54:31 UTC
[1/3] camel git commit: CAMEL-11335: Add route state details
Repository: camel
Updated Branches:
refs/heads/master 4d62cc71d -> a229f53d0
CAMEL-11335: Add route state details
Signed-off-by: Gregor Zurowski <gr...@zurowski.org>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/394c00e5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/394c00e5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/394c00e5
Branch: refs/heads/master
Commit: 394c00e56f724a83ca714a0f5ef1396327a39475
Parents: 4d62cc7
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Wed May 31 07:10:06 2017 +0200
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Wed May 31 07:10:06 2017 +0200
----------------------------------------------------------------------
.../actuate/endpoint/CamelRoutesEndpoint.java | 47 ++++++++++++++++++++
1 file changed, 47 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/394c00e5/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
index 3f44320..3cce647 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
@@ -24,6 +24,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import org.apache.camel.CamelContext;
import org.apache.camel.Route;
+import org.apache.camel.StatefulService;
import org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint.RouteEndpointInfo;
import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
import org.springframework.boot.actuate.endpoint.Endpoint;
@@ -66,11 +67,33 @@ public class CamelRoutesEndpoint extends AbstractEndpoint<List<RouteEndpointInfo
private final long uptimeMillis;
+ private Boolean started;
+
+ private Boolean starting;
+
+ private Boolean stopped;
+
+ private Boolean stopping;
+
+ private Boolean suspended;
+
+ private Boolean suspending;
+
public RouteEndpointInfo(Route route) {
this.id = route.getId();
this.description = route.getDescription();
this.uptime = route.getUptime();
this.uptimeMillis = route.getUptimeMillis();
+
+ if (route instanceof StatefulService) {
+ StatefulService statefulService = (StatefulService) route;
+ this.started = statefulService.isStarted();
+ this.starting = statefulService.isStarting();
+ this.stopped = statefulService.isStopped();
+ this.stopping = statefulService.isStopping();
+ this.suspended = statefulService.isSuspended();
+ this.suspending = statefulService.isSuspending();
+ }
}
public String getId() {
@@ -89,6 +112,30 @@ public class CamelRoutesEndpoint extends AbstractEndpoint<List<RouteEndpointInfo
return uptimeMillis;
}
+ public Boolean getStarted() {
+ return started;
+ }
+
+ public Boolean getStarting() {
+ return starting;
+ }
+
+ public Boolean getStopped() {
+ return stopped;
+ }
+
+ public Boolean getStopping() {
+ return stopping;
+ }
+
+ public Boolean getSuspended() {
+ return suspended;
+ }
+
+ public Boolean getSuspending() {
+ return suspending;
+ }
+
}
}
[3/3] camel git commit: CAMEL-11335: Rename status field
Posted by gz...@apache.org.
CAMEL-11335: Rename status field
Signed-off-by: Gregor Zurowski <gr...@zurowski.org>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a229f53d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a229f53d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a229f53d
Branch: refs/heads/master
Commit: a229f53d0ebae6e26fd76c83202f77cf62e80efb
Parents: 8bd0c59
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Wed May 31 09:32:41 2017 +0200
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Wed May 31 09:32:41 2017 +0200
----------------------------------------------------------------------
.../spring/boot/actuate/endpoint/CamelRoutesEndpoint.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a229f53d/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
index 0ccab97..a2a8b06 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
@@ -67,7 +67,7 @@ public class CamelRoutesEndpoint extends AbstractEndpoint<List<RouteEndpointInfo
private final long uptimeMillis;
- private String serviceStatus;
+ private String status;
public RouteEndpointInfo(Route route) {
this.id = route.getId();
@@ -76,7 +76,7 @@ public class CamelRoutesEndpoint extends AbstractEndpoint<List<RouteEndpointInfo
this.uptimeMillis = route.getUptimeMillis();
if (route instanceof StatefulService) {
- this.serviceStatus = ((StatefulService) route).getStatus().name();
+ this.status = ((StatefulService) route).getStatus().name();
}
}
@@ -96,8 +96,8 @@ public class CamelRoutesEndpoint extends AbstractEndpoint<List<RouteEndpointInfo
return uptimeMillis;
}
- public String getServiceStatus() {
- return serviceStatus;
+ public String getStatus() {
+ return status;
}
}
[2/3] camel git commit: CAMEL-11335: Retrieve status from
ServiceStatus enum
Posted by gz...@apache.org.
CAMEL-11335: Retrieve status from ServiceStatus enum
Signed-off-by: Gregor Zurowski <gr...@zurowski.org>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8bd0c594
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8bd0c594
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8bd0c594
Branch: refs/heads/master
Commit: 8bd0c59429e24be0ca5a33b81f5b5de68ad77a05
Parents: 394c00e
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Wed May 31 09:25:55 2017 +0200
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Wed May 31 09:25:55 2017 +0200
----------------------------------------------------------------------
.../actuate/endpoint/CamelRoutesEndpoint.java | 45 ++------------------
1 file changed, 4 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8bd0c594/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
index 3cce647..0ccab97 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
@@ -67,17 +67,7 @@ public class CamelRoutesEndpoint extends AbstractEndpoint<List<RouteEndpointInfo
private final long uptimeMillis;
- private Boolean started;
-
- private Boolean starting;
-
- private Boolean stopped;
-
- private Boolean stopping;
-
- private Boolean suspended;
-
- private Boolean suspending;
+ private String serviceStatus;
public RouteEndpointInfo(Route route) {
this.id = route.getId();
@@ -86,13 +76,7 @@ public class CamelRoutesEndpoint extends AbstractEndpoint<List<RouteEndpointInfo
this.uptimeMillis = route.getUptimeMillis();
if (route instanceof StatefulService) {
- StatefulService statefulService = (StatefulService) route;
- this.started = statefulService.isStarted();
- this.starting = statefulService.isStarting();
- this.stopped = statefulService.isStopped();
- this.stopping = statefulService.isStopping();
- this.suspended = statefulService.isSuspended();
- this.suspending = statefulService.isSuspending();
+ this.serviceStatus = ((StatefulService) route).getStatus().name();
}
}
@@ -112,30 +96,9 @@ public class CamelRoutesEndpoint extends AbstractEndpoint<List<RouteEndpointInfo
return uptimeMillis;
}
- public Boolean getStarted() {
- return started;
- }
-
- public Boolean getStarting() {
- return starting;
- }
-
- public Boolean getStopped() {
- return stopped;
- }
-
- public Boolean getStopping() {
- return stopping;
- }
-
- public Boolean getSuspended() {
- return suspended;
- }
-
- public Boolean getSuspending() {
- return suspending;
+ public String getServiceStatus() {
+ return serviceStatus;
}
-
}
}