Skip to content

ipgallery / mde

Go to a project
Commit 3e12c6f3 by Eli Ben Baruch
Options

configure microservice app to work with one worker thread only. use… 

 configure microservice app to work with one  worker thread only. use threadlocal in the websocketmanager for further changes of critical sections
parent 1fee5146
Inline Side-by-side
Showing with 108 additions and 101 deletions
cfg/config.properties
......@@ -6,5 +6,5 @@ log4j.prop.file.path=/logs/conf/log4j.xml
### microservice/rest server
server.port=50040
server.host=0.0.0.0
server.worker.threads=6
server.worker.threads=1
src/main/java/logic/webSocket/WebSocketConnection.java
......@@ -7,7 +7,6 @@ import http.simpleHttpClient.SimpleHttpResponse;
import logic.adapter.HttpAdapter.ErrorLoginException;
import logic.adapter.HttpAdapter.OAuth2Client;
import logic.adapter.HttpAdapter.model.NameValueParam;
import microservice.MicroserviceApp;
import web.App;
import java.io.IOException;
......@@ -20,7 +19,32 @@ import java.util.*;
public class WebSocketConnection extends Thread {
private final String maintenanceBasePath = "mde/api/v1/maintenance/";
private final String adapterId;
public WebSocketConnection(String adapterId, String connectionId, String uid, String webSocketUrl, OAuth2Client auth2Client, List<NameValueParam> defaultHeaders, OnEventDetails details, WebSocketEventListener eventListener) throws UnsupportedEncodingException, ErrorLoginException {
this.adapterId=adapterId;
this.isDisconnected =false;
this.disconnectedWaitingForMaintenance = false;
this.factory = new WebSocketFactory();
this.connectionId = connectionId;
this.uid = uid;
this.details= details;
this.webSocketUrl = webSocketUrl;
this.httpHeaders = defaultHeaders;
if (auth2Client != null) {
this.auth2Client = new OAuth2Client(auth2Client.getClientSecrets(), auth2Client.getCredential());
}
//http client to handle reconnect websocket
httpClient = new SimpleHttpClient();
httpClient.Initialize(100);
//for reconnection the listener is already exist
if(eventListener!=null)
this.eventListener = new WebSocketEventListener(this, adapterId,connectionId, this.uid, details,null, eventListener.getMapUidToDetails());
else
this.eventListener = new WebSocketEventListener(this, adapterId,connectionId, this.uid, details,null, null);
this.initReconnectRequest();
}
public String getUid() {
......@@ -55,43 +79,27 @@ public class WebSocketConnection extends Thread {
}
private Exception exception;
private volatile boolean webSocketOpen;
private volatile boolean isDisconnected;
private volatile boolean disconnectedWaitingForMaintenance;
public boolean isClosedWebSocketWaitingForMaintenance() {
return closedWebSocketWaitingForMaintenance;
public synchronized boolean isDisconnectedWaitingForMaintenance() {
return disconnectedWaitingForMaintenance;
}
private boolean closedWebSocketWaitingForMaintenance;
public WebSocketConnection(String adapterId, String connectionId,
String uid,
String webSocketUrl,
final OAuth2Client auth2Client,
List<NameValueParam> httpHeaders,
OnEventDetails details) throws IOException, ErrorLoginException, WebSocketException {
super();
this.adapterId=adapterId;
this.webSocketOpen =true;
this.factory = new WebSocketFactory();
this.connectionId = connectionId;
this.uid = uid;
this.details= details;
this.webSocketUrl = webSocketUrl;
this.httpHeaders = httpHeaders;
if (auth2Client != null) {
this.auth2Client = new OAuth2Client(auth2Client.getClientSecrets(), auth2Client.getCredential());
private synchronized boolean isDisconnected() {
return isDisconnected;
}
//http client to handle reconnect websocket
httpClient = new SimpleHttpClient();
httpClient.Initialize(100);
this.createReconnectRequest();
public synchronized void setDisconnected() {
this.isDisconnected=true;
this.disconnectedWaitingForMaintenance=true;
}
public synchronized void setDisconnectedWaitingForMaintenance(boolean waitingForMaintenance) {
this.disconnectedWaitingForMaintenance=waitingForMaintenance;
}
private void createReconnectRequest() {
private void initReconnectRequest() {
StringBuilder sb = new StringBuilder();
String[] params = adapterId.split("\\.");
......@@ -122,15 +130,15 @@ public class WebSocketConnection extends Thread {
webSocket.addHeader(header.getName(), header.getValue());
}
}
//for reconnection the listener is already exist
if(eventListener==null)
this.eventListener = new WebSocketEventListener(this, adapterId,connectionId, this.uid, details,null);
// //for reconnection the listener is already exist
// if(eventListener==null)
// this.eventListener = new WebSocketEventListener(this, adapterId,connectionId, this.uid, details,null);
webSocket.addListener(eventListener);
webSocket.setPingInterval(50*1000);
webSocket = webSocket.connect();
System.out.println("status of connection: " + connectionId+ ": " +eventListener.getState().toString());
System.out.println("WebSocketConnection.createWebSocket(): status of connection: " + connectionId+ ": " +eventListener.getState().toString());
}
public void addEventListener(String uid, OnEventDetails details) {
......@@ -191,13 +199,24 @@ public class WebSocketConnection extends Thread {
this.notify();
}
}
this.waitForClosedWebSocket();
// synchronized (this){
// try {
// this.wait(120*1000);
// //disconnection, not in case of already reconnected connection
// if (details!=null)
// webSocket.disconnect();
// } catch (InterruptedException e) {
// e.printStackTrace();
// }
// }
this.waitForDisconnection();
}
private void waitForClosedWebSocket() {
while (webSocketOpen) {
private void waitForDisconnection() {
while (!this.isDisconnected()) {
try {
Thread.sleep(500);
} catch (InterruptedException e) {
......@@ -207,23 +226,19 @@ public class WebSocketConnection extends Thread {
//Let the websocket maintenance a chance to handle the closed websocket
try {
this.closedWebSocketWaitingForMaintenance = true;
SimpleHttpResponse simpleHttpResponse = this.sendReconnectRequest();
if (simpleHttpResponse.getStatusCode()==200) {
while (this.closedWebSocketWaitingForMaintenance) {
this.sendReconnectRequest();
while (isDisconnectedWaitingForMaintenance()) {
try {
Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
System.out.println("maintenance reconnect msg was completed for: [adapterId-"+adapterId+" ,connectionId-" +connectionId+ "], closing websocket connection");
}
else{
System.out.println("maintenance reconnect msg failed, adapterId-"+adapterId+" ,connectionId-" +connectionId+ " closing websocket connection");
System.out.println("maintenance reconnect msg was completed for: [adapterId-" + adapterId + " ,connectionId-" + connectionId + "], closing websocket connection");
}
} catch (UnsupportedEncodingException e) {
catch (UnsupportedEncodingException e) {
System.out.println("reconnect failed with error: "+ e+", [adapterId-"+adapterId+" ,connectionId-" +connectionId+ "] closing websocket connection");
e.printStackTrace();
try {
......@@ -234,6 +249,8 @@ public class WebSocketConnection extends Thread {
}
}
private SimpleHttpResponse sendReconnectRequest() throws UnsupportedEncodingException {
SimpleHttpResponse simpleHttpResponse;
simpleHttpResponse = httpClient.processRequest(this.reConnectRequest);
......@@ -245,10 +262,6 @@ public class WebSocketConnection extends Thread {
this.exception = exception;
}
public void webSocketClosed() {
webSocketOpen = false;
}
public String getAdapterId() {
return adapterId;
}
......@@ -269,9 +282,6 @@ public class WebSocketConnection extends Thread {
return eventListener;
}
public void setIsClosedWebSocketWaitForMaintenance(boolean isClosedWebSocketWaitForMaintenance) {
this.closedWebSocketWaitingForMaintenance = isClosedWebSocketWaitForMaintenance;
}
}
......
src/main/java/logic/webSocket/WebSocketEventListener.java
package logic.webSocket;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonPointer;
import com.fasterxml.jackson.databind.JsonNode;
import com.flipkart.zjsonpatch.JsonPatch;
import com.google.api.client.json.Json;
import com.google.api.client.util.DateTime;
import com.neovisionaries.ws.client.*;
import defs.Constants;
import http.simpleHttpClient.SimpleHttpClient;
import http.simpleHttpClient.SimpleHttpRequest;
import http.simpleHttpClient.SimpleHttpResponse;
import logic.MdeManager;
import logic.adapter.action.JsonPatchAction;
import logic.adapter.model.ExtractValueActionParams;
import microservice.io.iface.ILogger;
import util.Utils;
......@@ -43,6 +37,14 @@ public class WebSocketEventListener implements WebSocketListener {
private SimpleHttpClient httpClient;
Map<String, OnEventDetails> getMapUidToDetails() {
return mapUidToDetails;
}
void setMapUidToDetails(Map<String, OnEventDetails> mapUidToDetails) {
this.mapUidToDetails = mapUidToDetails;
}
private Map<String, OnEventDetails > mapUidToDetails;
private String strStatus=null;
......@@ -67,7 +69,6 @@ public class WebSocketEventListener implements WebSocketListener {
}
}
}
return false;
}
......@@ -84,29 +85,24 @@ public class WebSocketEventListener implements WebSocketListener {
}
public WebSocketEventListener(WebSocketConnection webSocketConnection, String adapterId, String connectionId, String uid, OnEventDetails details, ILogger logFile) {
// String file=LOGS_LOCATION+Thread.currentThread().getName();
public WebSocketEventListener(WebSocketConnection webSocketConnection, String adapterId, String connectionId, String uid, OnEventDetails details, ILogger logFile, Map<String, OnEventDetails> mapUidToDetails) {
this.webSocketConnection=webSocketConnection;
this.adapterId=adapterId;
this.connectionId = connectionId;
this.logFile = logFile;
if (mapUidToDetails==null) {
this.mapUidToDetails = new HashMap<>();
this.resetStateFields();
this.mapUidToDetails.put(uid,details);
}
else
this.mapUidToDetails = mapUidToDetails;
this.httpClient = new SimpleHttpClient();
this.httpClient.Initialize(100);
}
public void resetStateFields(){
this.setState(WebSocketState.CREATED);
String str = connectionId +" "+ currentDate()+" "+"the state of the was set to: "+state.toString();
logging(str, eTraceLevel.eDEBUG,false);
}
private void logging(String str, eTraceLevel level, boolean writeToLog ) {
System.out.println(adapterId+" "+str);
if (writeToLog){
......@@ -213,7 +209,7 @@ public class WebSocketEventListener implements WebSocketListener {
@Override
public void onDisconnected(WebSocket websocket, WebSocketFrame serverCloseFrame, WebSocketFrame clientCloseFrame, boolean closedByServer) throws Exception {
String str = connectionId +" "+ currentDate()+" "+"onDisconnected: the WebSocket connection was closed by"+ ((closedByServer)?" server": " client");
this.webSocketConnection.webSocketClosed();
this.webSocketConnection.setDisconnected();
setState(websocket.getState());
logging(str, eTraceLevel.eDEBUG,false);
}
......@@ -238,7 +234,7 @@ public class WebSocketEventListener implements WebSocketListener {
/**
* Called when a continuation frame (opcode = 0x0) was received.
*
*20
* @param websocket The WebSocket.
* @param frame The continuation frame.
* @throws Exception An exception thrown by an implementation of this method.
......
src/main/java/logic/webSocket/WebSocketManager.java
......@@ -15,27 +15,28 @@ import java.util.Map;
*/
public class WebSocketManager {
private String adapterId;
private Map<String, WebSocketConnection> webSocketConnections;
private List<NameValueParam> defaultHeaders;
private OAuth2Client auth2Client;
private final String adapterId;
private ThreadLocal<Map<String, WebSocketConnection>> webSocketConnections;
private final List<NameValueParam> defaultHeaders;
private final OAuth2Client auth2Client;
public WebSocketManager(OAuth2Client oAuth2Client, List<NameValueParam> defaultHeaders, String adapterId)
{
this.adapterId=adapterId;
this.webSocketConnections = new HashMap<>();
this.webSocketConnections = new ThreadLocal<Map<String, WebSocketConnection>>(){
@Override
protected Map<String, WebSocketConnection> initialValue() {
return new HashMap<>();
}
};
this.defaultHeaders = defaultHeaders;
this.auth2Client = oAuth2Client;
}
public boolean isConnected( String connectionId, String uid){
StringBuilder sb = new StringBuilder();
sb.append(connectionId).append(":").append(uid);
String key = sb.toString();
if (webSocketConnections.containsKey(connectionId)){
WebSocketConnection connection = webSocketConnections.get(connectionId);
if (webSocketConnections.get().containsKey(connectionId)){
WebSocketConnection connection = webSocketConnections.get().get(connectionId);
if (connection!=null ){
if (connection.isRegisteredListener(uid))
return true;
......@@ -49,20 +50,22 @@ public class WebSocketManager {
sb.append(connectionId).append(":").append(uid);
String key = sb.toString();
WebSocketConnection connection,reConnection;
if (!webSocketConnections.containsKey(connectionId)) {
connection = new WebSocketConnection(adapterId,connectionId, uid, webSocketUrl, auth2Client, defaultHeaders, details);
if (!webSocketConnections.get().containsKey(connectionId)) {
connection = new WebSocketConnection(adapterId,connectionId, uid, webSocketUrl, auth2Client, defaultHeaders, details,null);
this.startConnection(connection,details);
}
else{
connection = webSocketConnections.get(connectionId);
if (connection.isClosedWebSocketWaitingForMaintenance()){
reConnection=createReconnection(webSocketUrl,connection);
this.startConnection(reConnection,details);
connection.setIsClosedWebSocketWaitForMaintenance(false);
}
else {
connection = webSocketConnections.get().get(connectionId);
if (connection.isDisconnectedWaitingForMaintenance()) {
System.out.println("websocketManager.connect[connectionId = " + connectionId + ", adapterId=" + connection.getAdapterId()+"]. RECONNECTING starts ");
reConnection = createReconnection(webSocketUrl, connection);
this.startConnection(reConnection, details);
connection.setDisconnectedWaitingForMaintenance(false);
} else {
connection.addEventListener(uid, details);
System.out.println("websocket updated successfully: " + connectionId + " " + "uid=" + uid + " was added to websocket. " + details.toString());
System.out.println("websocket updated successfully: " + connectionId + " " + "uid="
+ uid + " was added to websocket. " + ((details != null) ? details.toString() : "Details=NULL"));
}
}
}
......@@ -75,10 +78,8 @@ public class WebSocketManager {
reConnectUrl,
connection.getAuth2Client(),
connection.getHttpHeaders(),
connection.getDetails());
WebSocketEventListener listener = connection.getEventListener();
listener.resetStateFields();
reConnection.setEventListener(listener);
connection.getDetails(),
connection.getEventListener());
return reConnection;
}
......@@ -90,7 +91,7 @@ public class WebSocketManager {
if (connection.getException()!=null)
throw connection.getException();
else {
webSocketConnections.put(connection.getConnectionId(), connection);
webSocketConnections.get().put(connection.getConnectionId(), connection);
System.out.println(((details==null)?"RECONNECTED ":"")+"websocket created successfully: "
+ connection.getConnectionId()+ " uid="+connection.getUid()+" "+ ((details!=null)?details.toString():""));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment