Skip to content

Commit a58c9b1

Browse files
committed
Log "1st ever log event for the key"
1 parent 2fb50c2 commit a58c9b1

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

src/main/java/org/prebid/server/log/ConditionalLogger.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,10 @@ private static void log(String message, double samplingRate, Consumer<String> lo
7676
private void log(String message, long duration, TimeUnit unit, Consumer<String> logger) {
7777
final String key = ObjectUtils.defaultIfNull(this.key, message);
7878
final Instant currentTime = Instant.now();
79-
final Instant endTime = messageToWait.computeIfAbsent(
80-
key, ignored -> calculateEndTime(currentTime, duration, unit));
79+
final Instant endTime = messageToWait.get(key);
8180

82-
// we skip 1st ever log event for the key
83-
if (currentTime.isAfter(endTime) || currentTime.equals(endTime)) {
84-
messageToWait.replace(key, endTime, calculateEndTime(currentTime, duration, unit));
81+
if (endTime == null || endTime.isBefore(currentTime)) {
82+
messageToWait.put(key, calculateEndTime(currentTime, duration, unit));
8583
logger.accept(message);
8684
}
8785
}

src/test/java/org/prebid/server/log/ConditionalLoggerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void infoShouldSkipLogsForDuration() {
5959
}
6060

6161
// then
62-
verify(logger, times(2)).info("Log Message");
62+
verify(logger, times(3)).info("Log Message");
6363
}
6464

6565
@Test
@@ -74,7 +74,7 @@ public void infoShouldSkipLogsForKeyForDuration() {
7474
}
7575

7676
// then
77-
verify(logger, times(2)).info(argThat(o -> o.toString().startsWith("Log Message")));
77+
verify(logger, times(3)).info(argThat(o -> o.toString().startsWith("Log Message")));
7878
}
7979

8080
private void doWait(long timeout) {

0 commit comments

Comments
 (0)