From 9263e53c1d12a51d6e9fbbf9b813cf122019ccd2 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 25 Nov 2020 12:55:23 +0200 Subject: [PATCH] Throw exception on email or sms api limits. --- .../org/thingsboard/server/service/mail/DefaultMailService.java | 2 ++ .../org/thingsboard/server/service/sms/DefaultSmsService.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java index 7865321e67..e9cef05dd5 100644 --- a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java +++ b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java @@ -250,6 +250,8 @@ public class DefaultMailService implements MailService { helper.setText(body); mailSender.send(helper.getMimeMessage()); apiUsageClient.report(tenantId, ApiUsageRecordKey.EMAIL_EXEC_COUNT, 1); + } else { + throw new RuntimeException("Email sending is disabled due to API limits!"); } } diff --git a/application/src/main/java/org/thingsboard/server/service/sms/DefaultSmsService.java b/application/src/main/java/org/thingsboard/server/service/sms/DefaultSmsService.java index 203fc1127d..7f61476cd0 100644 --- a/application/src/main/java/org/thingsboard/server/service/sms/DefaultSmsService.java +++ b/application/src/main/java/org/thingsboard/server/service/sms/DefaultSmsService.java @@ -106,6 +106,8 @@ public class DefaultSmsService implements SmsService { apiUsageClient.report(tenantId, ApiUsageRecordKey.SMS_EXEC_COUNT, smsCount); } } + } else { + throw new RuntimeException("SMS sending is disabled due to API limits!"); } }