Ensure that ping is delayed for at least 5 seconds

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/service/HeartbeatService.java

@@ -153,7 +153,7 @@ private void sendPing(ChannelActiveListener writeListener, StreamConnection stre
 			if (!streamConn.isOpen()) return;
 
 			try {
-				streamConn.getSinkChannel().write(ByteBuffer.wrap(WEBSOCKET_PING));
+				((DelegatingStreamSinkConduit) streamConn.getSinkChannel().getConduit()).writeWithoutNotifying(ByteBuffer.wrap(WEBSOCKET_PING));
 				streamConn.getSinkChannel().flush();
 			} catch (IOException e) {
 				// Ignore failure, keep trying as long as the stream connection is valid.

src/main/java/eu/openanalytics/containerproxy/util/ChannelActiveListener.java

@@ -26,7 +26,7 @@
  */
 public class ChannelActiveListener implements Runnable {
 
-	long lastWrite = 0;
+	private long lastWrite = 0;
 
 	@Override
 	public void run() {
@@ -38,6 +38,12 @@ public void run() {
 	 */
 	public boolean isActive(long period) {
 		long diff = System.currentTimeMillis() - lastWrite;
+		
+		// make sure the period is at least 5 seconds
+		// this ensures that when the socket is active, the ping is delayed for at least 5 seconds
+		if (period < 5000) {
+			period = 5000;
+		}
 
 		if (diff <= period) {
 			return true;

src/main/java/eu/openanalytics/containerproxy/util/DelegatingStreamSinkConduit.java

@@ -127,6 +127,10 @@ public int write(ByteBuffer src) throws IOException {
 		return delegate.write(src);
 	}
 
+	public int writeWithoutNotifying(ByteBuffer src) throws IOException {
+		return delegate.write(src);
+	}
+
 	@Override
 	public long write(ByteBuffer[] srcs, int offs, int len) throws IOException {
 		return delegate.write(srcs, offs, len);