eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-24 14:38:45 +00:00
Code Activity

Implemented correct handling of multiple igtimi accounts in WindStatus servlet

Browse Source
This commit is contained in:
fmittag
2016-06-20 16:48:35 +02:00
parent f395c33cf2
commit 8165107167
2 changed files with 44 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/WindStatusHtmlServlet.java
+11 -2
View File
@@ -8,6 +8,7 @@ import java.util.Deque;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.Map.Entry;
import javax.servlet.ServletException;
@@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse;
import com.sap.sailing.domain.igtimiadapter.BulkFixReceiver;
import com.sap.sailing.domain.igtimiadapter.IgtimiWindListener;
import com.sap.sailing.domain.igtimiadapter.LiveDataConnection;
import com.sap.sse.common.TimePoint;
/**
@@ -43,8 +45,15 @@ public class WindStatusHtmlServlet extends WindStatusServlet implements IgtimiWi
out.println("<body>");
out.println("<p>Reload wind connectors with parameter <a href=\"/sailingserver/windStatus?reloadWindReceiver=true\">reloadWindReceiver=true</a>. This will force a connection reset and a reloading of the wind receivers.</p>");
out.println("<h3>Igtimi Wind Status ("+getIgtimiMessagesRawCount()+" raw messages received)</h3>");
if(getIgtimiConnectionInfo() != null) {
out.println("<h4>Igtimi Connection info: " + getIgtimiConnectionInfo().remoteAddress.toString() + "</h4>");
Map<LiveDataConnection, IgtimiConnectionInfo> igtimiConnections = getIgtimiConnections();
if (!igtimiConnections.isEmpty()) {
int igtimiConnectionCounter = 1;
for (Map.Entry<LiveDataConnection, IgtimiConnectionInfo> entry: igtimiConnections.entrySet()) {
IgtimiConnectionInfo igtimiConnectionInfo = entry.getValue();
out.println("<h4>Connection " + igtimiConnectionCounter +
" for account " + igtimiConnectionInfo.accountName + " : " + igtimiConnectionInfo.remoteAddress.toString() + "</h4>");
igtimiConnectionCounter++;
}
}
if (getLastIgtimiMessages() != null && !getLastIgtimiMessages().isEmpty()) {
for(Entry<String, Deque<IgtimiMessageInfo>> deviceAndMessagesList: getLastIgtimiMessages().entrySet()) {
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/WindStatusServlet.java
+33 -22
View File
@@ -12,6 +12,7 @@ import java.util.Date;
import java.util.Deque;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
@@ -65,8 +66,7 @@ public class WindStatusServlet extends SailingServerHttpServlet implements Igtim
private static int igtimiRawMessageCount;
private static Map<String, Deque<IgtimiMessageInfo>> lastIgtimiMessages;
private static IgtimiWindReceiver igtimiWindReceiver;
private static LiveDataConnection liveDataConnection;
private static IgtimiConnectionInfo igtimiConnectionInfo;
private static Map<LiveDataConnection, IgtimiConnectionInfo> igtimiConnections;
private static boolean isExpeditionListenerRegistered;
private static boolean isIgtimiListenerRegistered;
@@ -75,6 +75,7 @@ public class WindStatusServlet extends SailingServerHttpServlet implements Igtim
super();
isExpeditionListenerRegistered = false;
isIgtimiListenerRegistered = false;
igtimiConnections = new LinkedHashMap<>();
}
protected int getIgtimiMessagesRawCount() {
@@ -99,15 +100,21 @@ public class WindStatusServlet extends SailingServerHttpServlet implements Igtim
synchronized (lock) {
if (!isIgtimiListenerRegistered || reinitialize) {
if (reinitialize) {
try {
if (liveDataConnection != null) {
liveDataConnection.stop();
liveDataConnection.removeListener(igtimiWindReceiver);
liveDataConnection.removeListener(this);
igtimiConnectionInfo = null;
if (!igtimiConnections.isEmpty()) {
for (Map.Entry<LiveDataConnection, IgtimiConnectionInfo> entry: igtimiConnections.entrySet()) {
LiveDataConnection igtimiConnection = entry.getKey();
try {
if (igtimiConnection != null) {
igtimiConnection.stop();
igtimiConnection.removeListener(igtimiWindReceiver);
igtimiConnection.removeListener(this);
}
} catch (Exception e) {
e.printStackTrace();
}
}
} catch (Exception e) {
e.printStackTrace();
igtimiConnections.clear();
}
}
isIgtimiListenerRegistered = registerIgtimiListener();
@@ -199,12 +206,15 @@ public class WindStatusServlet extends SailingServerHttpServlet implements Igtim
if (account.getUser() != null) {
IgtimiConnection igtimiConnection = igtimiConnectionFactory.connect(account);
try {
liveDataConnection = igtimiConnection.getOrCreateLiveConnection(igtimiConnection.getWindDevices());
liveDataConnection.addListener(igtimiWindReceiver);
liveDataConnection.addListener(this);
LiveDataConnection newIgtimiConnection = igtimiConnection.getOrCreateLiveConnection(igtimiConnection.getWindDevices());
newIgtimiConnection.addListener(igtimiWindReceiver);
newIgtimiConnection.addListener(this);
IgtimiConnectionInfo newIgtimiConnectionInfo = new IgtimiConnectionInfo();
newIgtimiConnectionInfo.remoteAddress = newIgtimiConnection.getRemoteAddress();
newIgtimiConnectionInfo.accountName = account.getUser().getEmail();
igtimiConnections.put(newIgtimiConnection, newIgtimiConnectionInfo);
igtimiConnectionInfo = new IgtimiConnectionInfo();
igtimiConnectionInfo.remoteAddress = liveDataConnection.getRemoteAddress();
result = true;
} catch (Exception e) {
e.printStackTrace();
@@ -245,6 +255,7 @@ public class WindStatusServlet extends SailingServerHttpServlet implements Igtim
protected class IgtimiConnectionInfo {
InetSocketAddress remoteAddress;
String accountName;
}
protected class ExpeditionMessageInfo {
@@ -306,16 +317,16 @@ public class WindStatusServlet extends SailingServerHttpServlet implements Igtim
@Override
public void destroy() {
if (liveDataConnection != null) {
for (Map.Entry<LiveDataConnection, IgtimiConnectionInfo> entry: igtimiConnections.entrySet()) {
LiveDataConnection igtimiConnection = entry.getKey();
try {
liveDataConnection.stop();
igtimiConnection.stop();
} catch (Exception e) {
e.printStackTrace();
} finally {
liveDataConnection = null;
isIgtimiListenerRegistered = false;
}
}
igtimiConnections.clear();
isIgtimiListenerRegistered = false;
}
@Override
@@ -323,7 +334,7 @@ public class WindStatusServlet extends SailingServerHttpServlet implements Igtim
igtimiRawMessageCount += 1;
}
public static IgtimiConnectionInfo getIgtimiConnectionInfo() {
return igtimiConnectionInfo;
public static Map<LiveDataConnection, IgtimiConnectionInfo> getIgtimiConnections() {
return igtimiConnections;
}
}