Merge pull request #118 from UCY-Team/logging-round-trip

#74 More magic
logdyn · May 11, 2017 · 532cc41 · 532cc41
2 parents 42589fb + 8b08d44
commit 532cc41
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 27 deletions.
diff --git a/ymca/src/main/java/endpoints/LoggingEndpoint.java b/ymca/src/main/java/endpoints/LoggingEndpoint.java
@@ -6,6 +6,7 @@
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import java.util.logging.Level;
 
 import javax.websocket.CloseReason;
 import javax.websocket.Endpoint;
@@ -14,6 +15,8 @@
 import javax.websocket.Session;
 
 import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import models.LogMessage;
 
@@ -37,25 +40,52 @@ public void onOpen(final Session session, final EndpointConfig config)
 		session.addMessageHandler(new MessageHandler.Whole<String>()
 		{
 			@Override
-			public void onMessage(final String text)
+			public void onMessage(final String jsonString)
 			{
-				LoggingEndpoint.this.sessionId = text;
-				Set<LoggingEndpoint> set = LoggingEndpoint.endpoints.get(LoggingEndpoint.this.sessionId);
-
-				if (null == set)
-				{
-					set = new HashSet<>();
-					LoggingEndpoint.endpoints.put(LoggingEndpoint.this.sessionId, set);
-				}
-
-				set.add(LoggingEndpoint.this);
-
-				final SortedSet<LogMessage> messageQueue = LoggingEndpoint.messages.get(text);
+				JSONObject jsonObject = new JSONObject(jsonString);
 
-				if (null != messageQueue && !messageQueue.isEmpty())
+				if (jsonObject.has("httpSessionId"))
 				{
-					LoggingEndpoint.logToClient(LoggingEndpoint.this, new JSONArray(messageQueue).toString());
+					LoggingEndpoint.this.sessionId = jsonObject.getString("httpSessionId");
+					Set<LoggingEndpoint> set = LoggingEndpoint.endpoints.get(LoggingEndpoint.this.sessionId);
+
+					if (null == set)
+					{
+						set = new HashSet<>();
+						LoggingEndpoint.endpoints.put(LoggingEndpoint.this.sessionId, set);
+					}
+
+					set.add(LoggingEndpoint.this);
+
+					final SortedSet<LogMessage> messageQueue = LoggingEndpoint.messages.get(LoggingEndpoint.this.sessionId);
+
+					if (null != messageQueue && !messageQueue.isEmpty())
+					{
+						LoggingEndpoint.logToClient(LoggingEndpoint.this, new JSONArray(messageQueue).toString());
+					}
+				}
+				else
+				{					
+					try
+					{
+						jsonObject.put("sessionId", LoggingEndpoint.this.sessionId);
+						LogMessage logMessage = new LogMessage(jsonObject);
+						queueMessage(logMessage);
+
+						for (LoggingEndpoint endpoint : LoggingEndpoint.endpoints.get(LoggingEndpoint.this.sessionId))
+						{
+							if (!LoggingEndpoint.this.equals(endpoint))
+							{
+								logToClient(endpoint, logMessage.toJSONString());
+							}
+						}
+					}
+					catch (JSONException ex)
+					{
+						log(new LogMessage(Level.WARNING, ex.getMessage()));
+					}
 				}
+
 			}
 		});
 	}
@@ -125,8 +155,10 @@ public static void log(final LogMessage logMessage, final boolean queue)
 			}
 			else
 			{
-				System.err.println(String.format("No LoggingEndpoints regestered for session '%s'", sessionId));
+				System.err.println(String.format("No LoggingEndpoints registered for session '%s'", sessionId));
 				System.err.println(logMessage);
+				LoggingEndpoint.log(new LogMessage(Level.WARNING, 
+						String.format("No LoggingEndpoints registered for session '%s'", sessionId)));
 			}
 		}
 	}

diff --git a/ymca/src/main/java/models/LogMessage.java b/ymca/src/main/java/models/LogMessage.java
@@ -7,6 +7,7 @@
 import org.apache.commons.lang3.builder.CompareToBuilder;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONString;
 
@@ -70,6 +71,14 @@ public LogMessage(final String sessionId, final Level level, final String messag
 		this(sessionId, level, message, TimeFactory.currentTimeMillis());
 	}
 
+	public LogMessage(final JSONObject jsonObject) throws JSONException
+	{
+		this.sessionId = jsonObject.optString("sessionId", null);
+		this.level = Level.parse(jsonObject.optString("level", "FINE"));
+		this.message = jsonObject.getString("message");
+		this.timestamp = jsonObject.optLong("timestamp", TimeFactory.currentTimeMillis());
+	}
+
 	/**
 	 * Constructor
 	 * Ideally other constructors should be used

diff --git a/ymca/src/main/webapp/js/LoggingEndpoint.js b/ymca/src/main/webapp/js/LoggingEndpoint.js
@@ -9,8 +9,7 @@ var loggingEndpoint = {
 			websocket.onopen = function() 
 			{
 				//Sets up the logger instance with the correct session ID
-				loggingEndpoint.sendId(sessionId);
-                loggingEndpoint.log({level:'FINE', message:'Connection to server log opened'});
+				websocket.send('{"httpSessionId":"' + sessionId + '"}');
 			};
 
 			websocket.onmessage = function(message)
@@ -21,19 +20,25 @@ var loggingEndpoint = {
 				{
 					for (i in jsonMessage)
 					{
-						loggingEndpoint.log(jsonMessage[i]);
+						loggingEndpoint.log(jsonMessage[i], true);
 					}
 				}
 				else
 				{
-					loggingEndpoint.log(jsonMessage);
+					loggingEndpoint.log(jsonMessage, true);
 				}
 			};
 		},
 
-		log : function(logRecord)
+		log : function(logRecord, localOnly)
 		{
 			logRecord.level = logRecord.level.toUpperCase();
+
+			if (!logRecord.timestamp)
+			{
+				logRecord.timestamp = Date.now();
+			}
+
 			var func;
 			if(typeof outputLog === "object")
 			{
@@ -57,17 +62,17 @@ var loggingEndpoint = {
 					func = console.log;
 			}
 
+			if (!localOnly)
+			{
+				websocket.send(JSON.stringify(logRecord));
+			}
+
 			func(logRecord.level + " : " + logRecord.message);
 		},
 
 		closeConnect : function()
 		{
 			websocket.close();
-		},
-
-		sendId : function(id)
-		{
-			websocket.send(id);
 		}
 }
 

diff --git a/ymca/src/main/webapp/js/outputLog.js b/ymca/src/main/webapp/js/outputLog.js
@@ -36,7 +36,7 @@ var outputLog =
 		logElements.forEach(function(log) 
 		{
 			var levelClass;
-            var date = logRecord.timestamp ? new Date(logRecord.timestamp) : new Date();
+            var date = new Date(logRecord.timestamp);
             var timeHTML = '<span class="timestamp"><time datetime=' + date.toISOString() + ' title="' + date.toISOString() + '">' + date.toLocaleTimeString() + '</time> : </span>';
 			var iconHTML = '<span class="glyphicon';