Author: davsclaus
Date: Thu Jan 21 08:57:08 2010
New Revision: 901603
URL: http://svn.apache.org/viewvc?rev=901603&view=rev
Log:
CAMEL-2347: Added nagios component
Added:
camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
(with props)
Modified:
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
Modified:
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java?rev=901603&r1=901602&r2=901603&view=diff
==============================================================================
---
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java
(original)
+++
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java
Thu Jan 21 08:57:08 2010
@@ -19,7 +19,6 @@
import java.net.URI;
import java.util.Map;
-import com.googlecode.jsendnsca.core.NagiosSettings;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
@@ -30,7 +29,6 @@
*/
public class NagiosComponent extends DefaultComponent {
- private NagiosSettings nagiosSettings;
private NagiosConfiguration configuration;
public NagiosComponent() {
@@ -59,14 +57,6 @@
return endpoint;
}
- public NagiosSettings getNagiosSettings() {
- return nagiosSettings;
- }
-
- public void setNagiosSettings(NagiosSettings nagiosSettings) {
- this.nagiosSettings = nagiosSettings;
- }
-
public NagiosConfiguration getConfiguration() {
return configuration;
}
Modified:
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java?rev=901603&r1=901602&r2=901603&view=diff
==============================================================================
---
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
(original)
+++
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
Thu Jan 21 08:57:08 2010
@@ -16,7 +16,9 @@
*/
package org.apache.camel.component.nagios;
+import com.googlecode.jsendnsca.core.INagiosPassiveCheckSender;
import com.googlecode.jsendnsca.core.NagiosPassiveCheckSender;
+import com.googlecode.jsendnsca.core.NonBlockingNagiosPassiveCheckSender;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
@@ -29,8 +31,9 @@
*/
public class NagiosEndpoint extends DefaultEndpoint {
+ private INagiosPassiveCheckSender sender;
private NagiosConfiguration configuration;
- private NagiosPassiveCheckSender sender;
+ private boolean sendSync = true;
public NagiosEndpoint() {
}
@@ -60,14 +63,27 @@
this.configuration = configuration;
}
- public NagiosPassiveCheckSender getSender() {
+ public boolean isSendSync() {
+ return sendSync;
+ }
+
+ public void setSendSync(boolean sendSync) {
+ this.sendSync = sendSync;
+ }
+
+ public synchronized INagiosPassiveCheckSender getSender() {
if (sender == null) {
- sender = new
NagiosPassiveCheckSender(getConfiguration().getNagiosSettings());
+ if (isSendSync()) {
+ sender = new
NagiosPassiveCheckSender(getConfiguration().getNagiosSettings());
+ } else {
+ // use a non blocking sender
+ sender = new
NonBlockingNagiosPassiveCheckSender(getConfiguration().getNagiosSettings());
+ }
}
return sender;
}
- public void setSender(NagiosPassiveCheckSender sender) {
+ public void setSender(INagiosPassiveCheckSender sender) {
this.sender = sender;
}
}
Modified:
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java?rev=901603&r1=901602&r2=901603&view=diff
==============================================================================
---
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
(original)
+++
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
Thu Jan 21 08:57:08 2010
@@ -16,11 +16,13 @@
*/
package org.apache.camel.component.nagios;
+import com.googlecode.jsendnsca.core.INagiosPassiveCheckSender;
import com.googlecode.jsendnsca.core.Level;
import com.googlecode.jsendnsca.core.MessagePayload;
-import com.googlecode.jsendnsca.core.NagiosPassiveCheckSender;
+import com.googlecode.jsendnsca.core.NonBlockingNagiosPassiveCheckSender;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.util.concurrent.ExecutorServiceHelper;
import static org.apache.camel.component.nagios.NagiosConstants.HOST_NAME;
import static org.apache.camel.component.nagios.NagiosConstants.LEVEL;
@@ -31,9 +33,9 @@
*/
public class NagiosProducer extends DefaultProducer {
- private final NagiosPassiveCheckSender sender;
+ private final INagiosPassiveCheckSender sender;
- public NagiosProducer(NagiosEndpoint endpoint, NagiosPassiveCheckSender
sender) {
+ public NagiosProducer(NagiosEndpoint endpoint, INagiosPassiveCheckSender
sender) {
super(endpoint);
this.sender = sender;
}
@@ -59,5 +61,23 @@
log.trace("Sending notification done");
}
}
-
+
+ @Override
+ protected void doStart() throws Exception {
+ // if non blocking then set a executor service on it
+ if (sender instanceof NonBlockingNagiosPassiveCheckSender) {
+ NonBlockingNagiosPassiveCheckSender nonBlocking =
(NonBlockingNagiosPassiveCheckSender) sender;
+
nonBlocking.setExecutor(ExecutorServiceHelper.newSingleThreadExecutor(getEndpoint().getEndpointUri(),
true));
+ }
+ super.doStart();
+ }
+
+ @Override
+ protected void doStop() throws Exception {
+ super.doStop();
+ // if non blocking then shutdown executor
+ if (sender instanceof NonBlockingNagiosPassiveCheckSender) {
+ ((NonBlockingNagiosPassiveCheckSender) sender).shutdown();
+ }
+ }
}
Added:
camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java?rev=901603&view=auto
==============================================================================
---
camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
(added)
+++
camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
Thu Jan 21 08:57:08 2010
@@ -0,0 +1,38 @@
+/**
+ * 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.nagios;
+
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version $Revision$
+ */
+public class NagiosAsyncSendTest extends NagiosTest {
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ // START SNIPPET: e1
+
from("direct:start").to("nagios:127.0.0.1:5667?password=secret&sendSync=false").to("mock:result");
+ // END SNIPPET: e1
+ }
+ };
+ }
+
+}
\ No newline at end of file
Propchange:
camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java?rev=901603&r1=901602&r2=901603&view=diff
==============================================================================
---
camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
(original)
+++
camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
Thu Jan 21 08:57:08 2010
@@ -62,6 +62,9 @@
assertMockEndpointsSatisfied();
+ // sleep a little to let nagios stub process the payloads
+ Thread.sleep(1000);
+
assertEquals(1, nagios.getMessagePayloadList().size());
MessagePayload payload = nagios.getMessagePayloadList().get(0);
@@ -109,6 +112,9 @@
assertMockEndpointsSatisfied();
+ // sleep a little to let nagios stub process the payloads
+ Thread.sleep(1000);
+
assertEquals(1, nagios.getMessagePayloadList().size());
MessagePayload payload = nagios.getMessagePayloadList().get(0);
@@ -127,6 +133,9 @@
assertMockEndpointsSatisfied();
+ // sleep a little to let nagios stub process the payloads
+ Thread.sleep(1000);
+
assertEquals(1, nagios.getMessagePayloadList().size());
MessagePayload payload = nagios.getMessagePayloadList().get(0);
@@ -149,6 +158,9 @@
assertMockEndpointsSatisfied();
+ // sleep a little to let nagios stub process the payloads
+ Thread.sleep(1000);
+
assertEquals(1, nagios.getMessagePayloadList().size());
MessagePayload payload = nagios.getMessagePayloadList().get(0);
