You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/05/09 11:42:36 UTC
[1/2] camel git commit: CAMEL-9951: Setup default values for
thread-connected properties in WebSocket component
Repository: camel
Updated Branches:
refs/heads/master fc5a47729 -> cbc1718af
CAMEL-9951: Setup default values for thread-connected properties in WebSocket component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f89682b9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f89682b9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f89682b9
Branch: refs/heads/master
Commit: f89682b9fea3ab393ddd76b6b1c9dfe0ab5d4f86
Parents: fc5a477
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon May 9 13:35:02 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon May 9 13:35:02 2016 +0200
----------------------------------------------------------------------
.../apache/camel/component/websocket/WebsocketComponent.java | 6 +++++-
.../camel/component/websocket/WebsocketConsumerRouteTest.java | 4 ++--
.../websocket/WebsocketEndpointConfigurationTest.java | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f89682b9/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
index 0e9d1d9..ca0d6f6 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
@@ -159,6 +159,7 @@ public class WebsocketComponent extends UriEndpointComponent {
}
server.addConnector(connector);
+
LOG.trace("Jetty Connector added: {}", connector.getName());
// Create ServletContextHandler
@@ -213,6 +214,7 @@ public class WebsocketComponent extends UriEndpointComponent {
WebsocketProducer producer = WebsocketProducer.class.cast(prodcon);
producer.setStore(connectorRef.memoryStore);
}
+
}
}
@@ -339,7 +341,9 @@ public class WebsocketComponent extends UriEndpointComponent {
protected Server createServer() throws Exception {
Server server = null;
if (minThreads == null && maxThreads == null && getThreadPool() == null) {
- throw new RuntimeCamelException("Error creating JettyWebSocketServer. MinThreads/MaxThreads or ThreadPool must be defined");
+ minThreads = 1;
+ // 1+selectors+acceptors
+ maxThreads = 1 + Runtime.getRuntime().availableProcessors() * 2;
}
// configure thread pool if min/max given
if (minThreads != null || maxThreads != null) {
http://git-wip-us.apache.org/repos/asf/camel/blob/f89682b9/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java
index 20b2f40..97ff276 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java
@@ -109,8 +109,8 @@ public class WebsocketConsumerRouteTest extends CamelTestSupport {
public void configure() {
WebsocketComponent websocketComponent = (WebsocketComponent) context.getComponent("websocket");
websocketComponent.setPort(port);
- websocketComponent.setMaxThreads(20);
- websocketComponent.setMinThreads(1);
+// websocketComponent.setMaxThreads(20);
+// websocketComponent.setMinThreads(1);
from("websocket://echo")
.log(">>> Message received from WebSocket Client : ${body}")
http://git-wip-us.apache.org/repos/asf/camel/blob/f89682b9/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java
index 7d7d9aa..70bb917 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java
@@ -57,7 +57,7 @@ public class WebsocketEndpointConfigurationTest extends CamelTestSupport {
assertEquals("Get a worng maxIdleTime", "3000", maxIdleTime);
}
- @Test(expected = RuntimeException.class)
+ @Test
public void testSetServletNoMinThreadsNoMaxThreadsNoThreadPool() throws Exception {
port = AvailablePortFinder.getNextAvailable(16331);
String uri = "websocket://localhost:" + port + "/bar?bufferSize=65000&maxIdleTime=3000";
[2/2] camel git commit: CAMEL-9951: Update docs
Posted by ac...@apache.org.
CAMEL-9951: Update docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cbc1718a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cbc1718a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cbc1718a
Branch: refs/heads/master
Commit: cbc1718afc961e7dff46603c1379d23fd078a1fd
Parents: f89682b
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon May 9 13:40:02 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon May 9 13:40:02 2016 +0200
----------------------------------------------------------------------
components/camel-websocket/src/main/docs/websocket.adoc | 6 ++++--
.../apache/camel/component/websocket/WebsocketComponent.java | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cbc1718a/components/camel-websocket/src/main/docs/websocket.adoc
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/docs/websocket.adoc b/components/camel-websocket/src/main/docs/websocket.adoc
index 1a59752..44c13cf 100644
--- a/components/camel-websocket/src/main/docs/websocket.adoc
+++ b/components/camel-websocket/src/main/docs/websocket.adoc
@@ -34,6 +34,7 @@ Websocket Options
+
// component options: START
The Jetty Websocket component supports 12 options which are listed below.
@@ -49,8 +50,8 @@ The Jetty Websocket component supports 12 options which are listed below.
| sslPassword | String | The password when using SSL.
| sslKeystore | String | The path to the keystore.
| enableJmx | boolean | If this option is true Jetty JMX support will be enabled for this endpoint. See Jetty JMX support for more details.
-| minThreads | Integer | To set a value for minimum number of threads in server thread pool. MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9.
-| maxThreads | Integer | To set a value for maximum number of threads in server thread pool. MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9.
+| minThreads | Integer | To set a value for minimum number of threads in server thread pool. MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9. The default values for minThreads is 1.
+| maxThreads | Integer | To set a value for maximum number of threads in server thread pool. MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9. The default values for maxThreads is 1 2 noCores.
| threadPool | ThreadPool | To use a custom thread pool for the server. MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9.
| sslContextParameters | SSLContextParameters | To configure security using SSLContextParameters
| socketFactory | Map | To configure a map which contains custom WebSocketFactory for sub protocols. The key in the map is the sub protocol. The default key is reserved for the default implementation.
@@ -61,6 +62,7 @@ The Jetty Websocket component supports 12 options which are listed below.
+
// endpoint options: START
The Jetty Websocket component supports 20 endpoint options which are listed below:
http://git-wip-us.apache.org/repos/asf/camel/blob/cbc1718a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
index ca0d6f6..bdbc941 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
@@ -693,6 +693,7 @@ public class WebsocketComponent extends UriEndpointComponent {
/**
* To set a value for minimum number of threads in server thread pool. MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9.
+ * The default values for minThreads is 1.
*/
public void setMinThreads(Integer minThreads) {
this.minThreads = minThreads;
@@ -704,6 +705,7 @@ public class WebsocketComponent extends UriEndpointComponent {
/**
* To set a value for maximum number of threads in server thread pool. MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9.
+ * The default values for maxThreads is 1 + 2 * noCores.
*/
public void setMaxThreads(Integer maxThreads) {
this.maxThreads = maxThreads;