From ac1d9c0e529a3828bfedcc2c12b786f3305718f1 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Fri, 12 Apr 2019 17:51:17 +0000 Subject: [PATCH] message-bridges: add rate limits to the email logger --- .../messaging-bridges/templates/configmap.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/roles/openshift-apps/messaging-bridges/templates/configmap.yml b/roles/openshift-apps/messaging-bridges/templates/configmap.yml index f2ae79a145..bdcad76a15 100644 --- a/roles/openshift-apps/messaging-bridges/templates/configmap.yml +++ b/roles/openshift-apps/messaging-bridges/templates/configmap.yml @@ -79,6 +79,9 @@ data: [log_config] version = 1 disable_existing_loggers = true + [log_config.filters.ratelimit] + "()" = "fedmsg_migration_tools.config.RateLimiter" + rate = 120 [log_config.formatters.simple] format = "%(asctime)s [%(name)s %(levelname)s] %(message)s" datefmt = "%Y-%m-%d %H:%M:%S" @@ -88,6 +91,7 @@ data: stream = "ext://sys.stdout" [log_config.handlers.email] class = "logging.handlers.SMTPHandler" + filters = ["ratelimit"] formatter = "simple" mailhost = "bastion" fromaddr = "fedmsg-migration-tools@fedoraproject.org" @@ -128,6 +132,9 @@ data: [log_config] version = 1 disable_existing_loggers = true + [log_config.filters.ratelimit] + "()" = "fedmsg_migration_tools.config.RateLimiter" + rate = 120 [log_config.formatters.simple] format = "%(asctime)s [%(name)s %(levelname)s] %(message)s" datefmt = "%Y-%m-%d %H:%M:%S" @@ -137,6 +144,7 @@ data: stream = "ext://sys.stdout" [log_config.handlers.email] class = "logging.handlers.SMTPHandler" + filters = ["ratelimit"] formatter = "simple" mailhost = "bastion" fromaddr = "fedmsg-migration-tools@fedoraproject.org" @@ -204,6 +212,9 @@ data: [log_config] version = 1 disable_existing_loggers = true + [log_config.filters.ratelimit] + "()" = "fedmsg_migration_tools.config.RateLimiter" + rate = 120 [log_config.formatters.simple] format = "%(asctime)s [%(name)s %(levelname)s] %(message)s" datefmt = "%Y-%m-%d %H:%M:%S" @@ -214,6 +225,7 @@ data: [log_config.handlers.email] class = "logging.handlers.SMTPHandler" formatter = "simple" + filters = ["ratelimit"] mailhost = "bastion" fromaddr = "fedmsg-migration-tools@fedoraproject.org" toaddrs = ["jcline@fedoraproject.org", "abompard@fedoraproject.org"]