community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Provide workaround to address WS issue

Browse Source 
https://bz.apache.org/bugzilla/show_bug.cgi?id=56026
This commit is contained in:
charitha 2018-10-08 22:52:55 +05:30
parent 9af96d5fc4
commit 53e1d3abde
2 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/device-mgt/org.wso2.carbon.device.mgt.analytics.wsproxy/src/main/java/org/wso2/carbon/device/mgt/analytics/wsproxy/inbound/SubscriptionEndpoint.java
View File

@ -49,7 +49,7 @@ public class SubscriptionEndpoint {
* *
* @param session - Users registered session. * @param session - Users registered session.
*/ */
public void onOpen(Session session) { void onOpen(Session session) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("WebSocket opened, for Session id: " + session.getId()); log.debug("WebSocket opened, for Session id: " + session.getId());
} }
@ -68,8 +68,7 @@ public class SubscriptionEndpoint {
endpoint += "/"; endpoint += "/";
} }
endpoint += session.getRequestURI().getSchemeSpecificPart().replace("secured-websocket-proxy",""); endpoint += session.getRequestURI().getSchemeSpecificPart().replace("secured-websocket-proxy","");
AnalyticsClient analyticsClient = new AnalyticsClient(session); AnalyticsClient analyticsClient = new AnalyticsClient(session, new URI(endpoint));
analyticsClient.connectClient(new URI(endpoint));
analyticsClients.add(analyticsClient); analyticsClients.add(analyticsClient);
} catch (URISyntaxException e) { } catch (URISyntaxException e) {
log.error("Unable to create URL from: " + endpoint, e); log.error("Unable to create URL from: " + endpoint, e);
@ -121,7 +120,7 @@ public class SubscriptionEndpoint {
* @param session - Users registered session. * @param session - Users registered session.
* @param message - Status code for web-socket close. * @param message - Status code for web-socket close.
*/ */
public void onMessage(Session session, String message) { void onMessage(Session session, String message) {
for (AnalyticsClient analyticsClient : analyticsClientsMap.get(session.getId())) { for (AnalyticsClient analyticsClient : analyticsClientsMap.get(session.getId())) {
if (analyticsClient != null) { if (analyticsClient != null) {
analyticsClient.sendMessage(message); analyticsClient.sendMessage(message);

43
components/device-mgt/org.wso2.carbon.device.mgt.analytics.wsproxy/src/main/java/org/wso2/carbon/device/mgt/analytics/wsproxy/outbound/AnalyticsClient.java
View File

@ -42,24 +42,18 @@ public class AnalyticsClient {
private static final Log log = LogFactory.getLog(AnalyticsClient.class); private static final Log log = LogFactory.getLog(AnalyticsClient.class);
private WebSocketContainer container; private final Session analyticsSession;
private Session analyticsSession = null; private final Session clientSession;
private Session clientSession;
/** /**
* Create {@link AnalyticsClient} instance. * Create {@link AnalyticsClient} instance.
*/ */
public AnalyticsClient(Session clientSession) { public AnalyticsClient(Session clientSession, URI endpointURI) throws WSProxyException {
container = ContainerProvider.getWebSocketContainer(); WebSocketContainer container = ContainerProvider.getWebSocketContainer();
this.clientSession = clientSession; this.clientSession = clientSession;
}
/**
* Create web socket client connection using {@link WebSocketContainer}.
*/
public void connectClient(URI endpointURI) throws WSProxyException {
try { try {
analyticsSession = container.connectToServer(this, endpointURI); this.analyticsSession = container.connectToServer(this, endpointURI);
} catch (DeploymentException | IOException e) { } catch (DeploymentException | IOException e) {
String msg = "Error occurred while connecting to remote endpoint " + endpointURI.toString(); String msg = "Error occurred while connecting to remote endpoint " + endpointURI.toString();
log.error(msg, e); log.error(msg, e);
@ -79,7 +73,6 @@ public class AnalyticsClient {
log.debug("Closing web socket session: '" + userSession.getId() + "'. Code: " + log.debug("Closing web socket session: '" + userSession.getId() + "'. Code: " +
reason.getCloseCode().toString() + " Reason: " + reason.getReasonPhrase()); reason.getCloseCode().toString() + " Reason: " + reason.getReasonPhrase());
} }
this.analyticsSession = null;
} }
/** /**
@ -91,7 +84,16 @@ public class AnalyticsClient {
*/ */
@OnMessage @OnMessage
public void onMessage(String message) { public void onMessage(String message) {
this.clientSession.getAsyncRemote().sendText(message); synchronized (this.clientSession) {
try {
this.clientSession.getBasicRemote().sendText(message);
} catch (IOException e) {
log.warn("Sending message to client failed due to " + e.getMessage());
if (log.isDebugEnabled()) {
log.debug("Full stack trace:", e);
}
}
}
} }
/** /**
@ -100,14 +102,23 @@ public class AnalyticsClient {
* @param message the message which is going to send. * @param message the message which is going to send.
*/ */
public void sendMessage(String message) { public void sendMessage(String message) {
this.analyticsSession.getAsyncRemote().sendText(message); synchronized (this.analyticsSession) {
try {
this.analyticsSession.getBasicRemote().sendText(message);
} catch (IOException e) {
log.warn("Sending message to analytics failed due to " + e.getMessage());
if (log.isDebugEnabled()) {
log.debug("Full stack trace:", e);
}
}
}
} }
/** /**
* Close current connection. * Close current connection.
*/ */
public void closeConnection(CloseReason closeReason) throws WSProxyException { public void closeConnection(CloseReason closeReason) throws WSProxyException {
if (this.analyticsSession != null) { if (this.analyticsSession.isOpen()) {
try { try {
this.analyticsSession.close(closeReason); this.analyticsSession.close(closeReason);
} catch (IOException e) { } catch (IOException e) {
@ -115,6 +126,8 @@ public class AnalyticsClient {
log.error(msg, e); log.error(msg, e);
throw new WSProxyException(msg, e); throw new WSProxyException(msg, e);
} }
} else {
log.warn("Analytics session '" + this.analyticsSession.getId() + "' is already closed");
} }
} }
} }