Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit 04960a2

Browse files
committed
improvement in ReplayMessageHandler
1 parent 92b7dc8 commit 04960a2

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

tracker-server/src/main/java/tracker/server/BrowserEvents.java

+1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
*/
88
public interface BrowserEvents {
99
String userPositionTracking = "user-position-tracking";
10+
String replayUserPositions = "replay-user-positions";
1011
}

tracker-server/src/main/java/tracker/server/TrackerServer.java

+7
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,13 @@ static Router createRouter() {
375375
new PermittedOptions().setAddress(BrowserEvents.userPositionTracking)
376376
));
377377

378+
options.setOutboundPermitted(ImmutableList.of(
379+
new PermittedOptions().setAddress(BrowserEvents.replayUserPositions)
380+
));
381+
options.setInboundPermitted(ImmutableList.of(
382+
new PermittedOptions().setAddress(BrowserEvents.replayUserPositions)
383+
));
384+
378385
sockJSHandler.bridge(options);
379386

380387
router.route("/eventbus/*").handler(sockJSHandler);

tracker/src/main/java/tracker/Addresses.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public interface Addresses {
1111

1212
String authenticate = "authenticate";
1313
String findAllPositionsGroupByUserId = findAll(Entities.POSITION_ENTITY) + ".group-by-user-id";
14-
String replayUserPositions = "replayUserPositions";
14+
String replayUserPositions = "replay-user-positions";
1515

1616
static String post(String address) {
1717
Objects.requireNonNull(address);

tracker/src/main/java/tracker/message/handlers/impl/ReplayMessageHandlerImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void handle(Message<JsonObject> message) {
6060

6161
private void reqReplyLoop(LoopContext context) {
6262

63-
final int reqSlots = context.getReqSlots();
63+
final int reqSlots = Math.min(context.getReqSlots(), context.getTotalSlots() - context.getSlotsReturned());
6464
final Message<JsonObject> message = context.getMessage();
6565

6666
new ReplayServiceImpl(

0 commit comments

Comments
 (0)