cgould/lingo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add heartbeats and bump versions

Browse Source
This commit is contained in:
Charles Gould 2018-02-11 17:28:00 -05:00
parent 59ae9b279d
commit d66bc9c900
4 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.7.RELEASE</version> <version>1.5.10.RELEASE</version>
</parent> </parent>
<groupId>com.charego</groupId> <groupId>com.charego</groupId>

19
server/src/main/java/lingo/server/WebSocketConfig.java
View File

@ -3,6 +3,8 @@ package lingo.server;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.messaging.simp.config.ChannelRegistration; import org.springframework.messaging.simp.config.ChannelRegistration;
import org.springframework.messaging.simp.config.MessageBrokerRegistry; import org.springframework.messaging.simp.config.MessageBrokerRegistry;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer; import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
import org.springframework.web.socket.config.annotation.StompEndpointRegistry; import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
@ -25,7 +27,9 @@ public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
@Override @Override
public void configureMessageBroker(MessageBrokerRegistry registry) { public void configureMessageBroker(MessageBrokerRegistry registry) {
registry.enableSimpleBroker("/topic"); registry.enableSimpleBroker("/topic")
.setTaskScheduler(heartbeatScheduler())
.setHeartbeatValue(heartbeatValue());
registry.setApplicationDestinationPrefixes("/app", "/user"); registry.setApplicationDestinationPrefixes("/app", "/user");
registry.setUserDestinationPrefix("/user"); registry.setUserDestinationPrefix("/user");
} }
@ -36,4 +40,17 @@ public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
registry.addEndpoint("/stomp"); registry.addEndpoint("/stomp");
} }
private TaskScheduler heartbeatScheduler() {
// Single thread unless/until more threads are needed
final ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
taskScheduler.setPoolSize(1);
taskScheduler.setThreadNamePrefix("Keep-Alive-");
taskScheduler.initialize();
return taskScheduler;
}
private long[] heartbeatValue() {
return new long[] { 25000, 25000 };
}
} }

2
server/src/main/resources/static/client.js
View File

@ -280,6 +280,8 @@ function main() {
} }
client = Stomp.client(`${webSocketProtocol}://${location.host}/stomp`); client = Stomp.client(`${webSocketProtocol}://${location.host}/stomp`);
client.heartbeat.outgoing = 25000; // send PING every 25 seconds
client.heartbeat.incoming = 0; // do NOT want PONGs from server
client.connect({}, afterConnected, function(errorMessage) { client.connect({}, afterConnected, function(errorMessage) {
addChatAnnouncement(errorMessage); addChatAnnouncement(errorMessage);
addChatAnnouncement('Please reload the page!'); addChatAnnouncement('Please reload the page!');

2
server/src/main/resources/static/index.html
View File

@ -5,7 +5,7 @@
<title>Lingo</title> <title>Lingo</title>
<link rel="stylesheet" href="layout.css"> <link rel="stylesheet" href="layout.css">
<link rel="stylesheet" href="style.css"> <link rel="stylesheet" href="style.css">
<script src="//cdnjs.cloudflare.com/ajax/libs/vue/2.5.2/vue.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/vue/2.5.13/vue.js"></script>
</head> </head>
<body> <body>
<div id="vue-app" v-cloak> <div id="vue-app" v-cloak>