From 8c9d8712686e7c6eda49c406259dad39c79f81fc Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Mon, 22 Feb 2021 15:31:40 -0500 Subject: [PATCH] Log different messages depending on whether rate limits are actually enforced. --- .../textsecuregcm/controllers/MessageController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java index 94daf8b4e..aa3275b7e 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java @@ -139,10 +139,12 @@ public class MessageController { rateLimiters.getUnsealedSenderLimiter().validate(source.get().getUuid().toString(), destinationName.toString()); } catch (RateLimitExceededException e) { Metrics.counter(REJECT_UNSEALED_SENDER_COUNTER_NAME, SENDER_COUNTRY_TAG_NAME, Util.getCountryCode(source.get().getNumber())).increment(); - logger.debug("Rejected unsealed sender limit from: {}", source.get().getNumber()); if (dynamicConfigurationManager.getConfiguration().getMessageRateConfiguration().isEnforceUnsealedSenderRateLimit()) { + logger.debug("Rejected unsealed sender limit from: {}", source.get().getNumber()); throw e; + } else { + logger.debug("Would reject unsealed sender limit from: {}", source.get().getNumber()); } } }