You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/07/21 16:24:21 UTC
[3/3] camel git commit: CAMEL-11572 - Fix camel-lumberjack component
lifecycle
CAMEL-11572 - Fix camel-lumberjack component lifecycle
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1cc3ee3b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1cc3ee3b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1cc3ee3b
Branch: refs/heads/camel-2.18.x
Commit: 1cc3ee3bac211909f2d7afab74292c0fb4bfaff1
Parents: d4d9852
Author: Antoine DESSAIGNE <an...@gmail.com>
Authored: Fri Jul 21 14:35:56 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jul 21 18:24:11 2017 +0200
----------------------------------------------------------------------
.../lumberjack/LumberjackConsumer.java | 6 +++
.../LumberjackComponentLifecycleTest.java | 56 ++++++++++++++++++++
2 files changed, 62 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1cc3ee3b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackConsumer.java b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackConsumer.java
index 48c5010..5db821e 100644
--- a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackConsumer.java
+++ b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackConsumer.java
@@ -41,6 +41,12 @@ public class LumberjackConsumer extends DefaultConsumer {
}
@Override
+ protected void doStop() throws Exception {
+ lumberjackServer.stop();
+ super.doStop();
+ }
+
+ @Override
protected void doResume() throws Exception {
super.doResume();
lumberjackServer.start();
http://git-wip-us.apache.org/repos/asf/camel/blob/1cc3ee3b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentLifecycleTest.java
----------------------------------------------------------------------
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentLifecycleTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentLifecycleTest.java
new file mode 100644
index 0000000..cbaed47
--- /dev/null
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentLifecycleTest.java
@@ -0,0 +1,56 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.camel.component.lumberjack;
+
+import org.apache.camel.ServiceStatus;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class LumberjackComponentLifecycleTest extends CamelTestSupport {
+ private static int port;
+
+ @BeforeClass
+ public static void beforeClass() {
+ port = AvailablePortFinder.getNextAvailable();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ // Lumberjack configured with a specific port
+ from("lumberjack:0.0.0.0:" + port).to("mock:output");
+ }
+ };
+ }
+
+ @Test(timeout = 30_000)
+ public void shouldRestart() throws Exception {
+ // Given a started context
+ assertEquals(ServiceStatus.Started, context.getStatus());
+
+ // When restarting it
+ context.stop();
+ context.start();
+
+ // Then the context is started
+ assertEquals(ServiceStatus.Started, context.getStatus());
+ }
+}