Skip to content

Commit d554229

Browse files
committed
Fix incomplete log message
Commit 48236b from 2014 introduced a logging improvement to avoid logging each removed session per line and instead log one line at the end with all removed sessions ids. However that list of removed session ids wasn't populated. This commit fixes that. Issue: SPR-14111
1 parent 996c1cc commit d554229

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,14 +359,15 @@ private void scheduleSessionTask() {
359359
if (this.sessionCleanupTask != null) {
360360
return;
361361
}
362-
final List<String> removedSessionIds = new ArrayList<String>();
363362
this.sessionCleanupTask = getTaskScheduler().scheduleAtFixedRate(new Runnable() {
364363
@Override
365364
public void run() {
365+
List<String> removedIds = new ArrayList<String>();
366366
for (SockJsSession session : sessions.values()) {
367367
try {
368368
if (session.getTimeSinceLastActive() > getDisconnectDelay()) {
369369
sessions.remove(session.getId());
370+
removedIds.add(session.getId());
370371
session.close();
371372
}
372373
}
@@ -375,9 +376,8 @@ public void run() {
375376
logger.debug("Failed to close " + session, ex);
376377
}
377378
}
378-
if (logger.isDebugEnabled() && !removedSessionIds.isEmpty()) {
379-
logger.debug("Closed " + removedSessionIds.size() + " sessions " + removedSessionIds);
380-
removedSessionIds.clear();
379+
if (logger.isDebugEnabled() && !removedIds.isEmpty()) {
380+
logger.debug("Closed " + removedIds.size() + " sessions: " + removedIds);
381381
}
382382
}
383383
}, getDisconnectDelay());

0 commit comments

Comments
 (0)