v1.20

- changed access to lastAction in client class, which helps for server-based client that can now override this method - reduced ping sent out depending on lastAction - fixed wrong event count in metrics (should have been five times higher)
iddi · Dec 30, 2020 · b25733d · b25733d
1 parent 23c2906
commit b25733d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 13 deletions.
diff --git a/server/dist/OOCSI_server.jar b/server/dist/OOCSI_server.jar
diff --git a/server/src/nl/tue/id/oocsi/server/OOCSIServer.java b/server/src/nl/tue/id/oocsi/server/OOCSIServer.java
@@ -27,7 +27,7 @@
 public class OOCSIServer extends Server {
 
 	// constants
-	public static final String VERSION = "1.19";
+	public static final String VERSION = "1.20";
 
 	// defaults for different services
 	private int maxClients = 100;
@@ -420,7 +420,10 @@ public void statusTask() {
 
 			// keep-alive ping-pong with socket clients
 			for (Client client : INSTANCE.getClients()) {
-				client.ping();
+				// only ping if last action is at least 5 seconds ago
+				if (client.lastAction() + 5000 < start) {
+					client.ping();
+				}
 			}
 
 			long afterPings = System.currentTimeMillis();
@@ -464,8 +467,8 @@ public void statusTask() {
 				// total messages since startup
 				message.addData("messagesTotal", messageTotal);
 
-				// messages per second, averaged over 5 seconds
-				message.addData("messages", (int) Math.ceil(messageCount / 5.));
+				// messages per second
+				message.addData("messages", messageCount);
 
 				// channel count
 				message.addData("channels", INSTANCE.subChannels.size());

diff --git a/server/src/nl/tue/id/oocsi/server/model/Client.java b/server/src/nl/tue/id/oocsi/server/model/Client.java
@@ -14,7 +14,7 @@ protected enum ClientType {
 		OOCSI, PD, JSON, OSC
 	}
 
-	protected long lastAction = System.currentTimeMillis();
+	private long lastAction = System.currentTimeMillis();
 
 	/**
 	 * constructor
@@ -63,4 +63,12 @@ public Client(String token, ChangeListener presence) {
 	public long lastAction() {
 		return lastAction;
 	}
+
+	/**
+	 * set last action to now
+	 * 
+	 */
+	public void touch() {
+		lastAction = System.currentTimeMillis();
+	}
 }
diff --git a/server/src/nl/tue/id/oocsi/server/model/Server.java b/server/src/nl/tue/id/oocsi/server/model/Server.java
@@ -100,7 +100,7 @@ public boolean addClient(Client client) {
 				if (socketClientOld.getIPAddress() != null && socketClientNew.getIPAddress() != null) {
 					if (socketClientOld.getIPAddress().equals(socketClientNew.getIPAddress())) {
 						// check mini-timeout (last action of old socket at least 2 seconds ago)
-						if (socketClientOld.lastAction < System.currentTimeMillis() - 2000) {
+						if (socketClientOld.lastAction() < System.currentTimeMillis() - 2000) {
 
 							// kill old socket
 							presence.leave(clientName, clientName);
@@ -175,15 +175,15 @@ public boolean canAcceptClient(Client c) {
 	 */
 	protected void closeStaleClients() {
 		long now = System.currentTimeMillis();
-		for (Client existingClient : clients.values()) {
-			if (now - existingClient.lastAction() > 120000 || !existingClient.isConnected()) {
-				OOCSIServer.log("Client " + existingClient.getName()
+		for (Client client : clients.values()) {
+			if (client.lastAction() + 120000 < now || !client.isConnected()) {
+				OOCSIServer.log("Client " + client.getName()
 				        + " has not responded for 120 secs and will be disconnected");
 
 				// remove from presence tracking if tracking
-				presence.timeout(existingClient.getName(), existingClient.getName());
+				presence.timeout(client.getName(), client.getName());
 
-				removeClient(existingClient);
+				removeClient(client);
 			}
 		}
 	}

diff --git a/server/src/nl/tue/id/oocsi/server/services/SocketClient.java b/server/src/nl/tue/id/oocsi/server/services/SocketClient.java
@@ -240,7 +240,7 @@ public void run() {
 					if ((inputLine = input.readLine()) != null) {
 
 						// update last action
-						lastAction = System.currentTimeMillis();
+						touch();
 
 						// do some filtering for SSH clients connecting and other abuse
 						if (inputLine.length() > 200) {
@@ -297,7 +297,7 @@ public void run() {
 							while ((inputLine = input.readLine()) != null) {
 
 								// update last action
-								lastAction = System.currentTimeMillis();
+								touch();
 
 								// clean input from PD clients
 								if (type == ClientType.PD) {