added JSONSerializationProvider so that it knows how to serialize logical plan
Conflicts:
gateway/src/main/java/com/datatorrent/gateway/resources/ws/v2/AppPackagesResource.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/09134568
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/09134568
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/09134568
Branch: refs/heads/devel-3
Commit: 091345688a1b95bf3071f604058a9ebfc9f688f2
Parents: 34b92cb
Author: David Yan <[email protected]>
Authored: Thu Feb 12 16:08:47 2015 -0800
Committer: David Yan <[email protected]>
Committed: Fri Aug 28 10:56:57 2015 -0700
----------------------------------------------------------------------
PubSubWebSocketServlet.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/09134568/PubSubWebSocketServlet.java
----------------------------------------------------------------------
diff --git a/PubSubWebSocketServlet.java b/PubSubWebSocketServlet.java
index f628364..842f7f6 100644
--- a/PubSubWebSocketServlet.java
+++ b/PubSubWebSocketServlet.java
@@ -25,14 +25,14 @@ import org.eclipse.jetty.websocket.WebSocketServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.datatorrent.lib.util.JacksonObjectMapperProvider;
-import com.datatorrent.lib.util.PubSubMessage;
-import com.datatorrent.lib.util.PubSubMessage.PubSubMessageType;
-import com.datatorrent.lib.util.PubSubMessageCodec;
+import com.datatorrent.common.util.PubSubMessage;
+import com.datatorrent.common.util.PubSubMessage.PubSubMessageType;
+import com.datatorrent.common.util.PubSubMessageCodec;
import com.datatorrent.gateway.security.AuthDatabase;
import com.datatorrent.gateway.security.AuthenticationException;
import com.datatorrent.gateway.security.DTPrincipal;
+import com.datatorrent.stram.util.JSONSerializationProvider;
import com.datatorrent.stram.util.LRUCache;
@@ -48,7 +48,7 @@ public class PubSubWebSocketServlet extends WebSocketServlet
private static final long serialVersionUID = 1L;
private HashMap<String, HashSet<PubSubWebSocket>> topicToSocketMap = new
HashMap<String, HashSet<PubSubWebSocket>>();
private HashMap<PubSubWebSocket, HashSet<String>> socketToTopicMap = new
HashMap<PubSubWebSocket, HashSet<String>>();
- private ObjectMapper mapper = (new
JacksonObjectMapperProvider()).getContext(null);
+ private ObjectMapper mapper = (new
JSONSerializationProvider()).getContext(null);
private PubSubMessageCodec<Object> codec = new
PubSubMessageCodec<Object>(mapper);
private InternalMessageHandler internalMessageHandler = null;
private static final int latestTopicCount = 100;
@@ -308,7 +308,7 @@ public class PubSubWebSocketServlet extends WebSocketServlet
private class PubSubWebSocket implements WebSocket.OnTextMessage
{
private Connection connection;
- private final BlockingQueue<String> messageQueue = new
ArrayBlockingQueue<String>(32);
+ private final BlockingQueue<String> messageQueue = new
ArrayBlockingQueue<String>(1024);
private final Thread messengerThread = new Thread(new Messenger());
private final DTPrincipal principal;
@@ -385,7 +385,8 @@ public class PubSubWebSocketServlet extends WebSocketServlet
{
LOG.debug("onOpen");
this.connection = connection;
- this.connection.setMaxIdleTime(60 * 60 * 1000); // idle time set to one
hour to clear out idle connections from taking resources
+ this.connection.setMaxIdleTime(5 * 60 * 1000); // idle time set to five
minute to clear out idle connections from taking resources
+ this.connection.setMaxTextMessageSize(8 * 1024 * 1024); // allow larger
text message
messengerThread.start();
}
