Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

message-bridges: add rate limits to the email logger

Browse source
This commit is contained in:
Jeremy Cline 2019-04-12 17:51:17 +00:00
parent 6dc8fb4d26
commit ac1d9c0e52
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
roles/openshift-apps/messaging-bridges/templates/configmap.yml
View file

@ -79,6 +79,9 @@ data:
[log_config] [log_config]
version = 1 version = 1
disable_existing_loggers = true disable_existing_loggers = true
[log_config.filters.ratelimit]
"()" = "fedmsg_migration_tools.config.RateLimiter"
rate = 120
[log_config.formatters.simple] [log_config.formatters.simple]
format = "%(asctime)s [%(name)s %(levelname)s] %(message)s" format = "%(asctime)s [%(name)s %(levelname)s] %(message)s"
datefmt = "%Y-%m-%d %H:%M:%S" datefmt = "%Y-%m-%d %H:%M:%S"
@ -88,6 +91,7 @@ data:
stream = "ext://sys.stdout" stream = "ext://sys.stdout"
[log_config.handlers.email] [log_config.handlers.email]
class = "logging.handlers.SMTPHandler" class = "logging.handlers.SMTPHandler"
filters = ["ratelimit"]
formatter = "simple" formatter = "simple"
mailhost = "bastion" mailhost = "bastion"
fromaddr = "fedmsg-migration-tools@fedoraproject.org" fromaddr = "fedmsg-migration-tools@fedoraproject.org"
@ -128,6 +132,9 @@ data:
[log_config] [log_config]
version = 1 version = 1
disable_existing_loggers = true disable_existing_loggers = true
[log_config.filters.ratelimit]
"()" = "fedmsg_migration_tools.config.RateLimiter"
rate = 120
[log_config.formatters.simple] [log_config.formatters.simple]
format = "%(asctime)s [%(name)s %(levelname)s] %(message)s" format = "%(asctime)s [%(name)s %(levelname)s] %(message)s"
datefmt = "%Y-%m-%d %H:%M:%S" datefmt = "%Y-%m-%d %H:%M:%S"
@ -137,6 +144,7 @@ data:
stream = "ext://sys.stdout" stream = "ext://sys.stdout"
[log_config.handlers.email] [log_config.handlers.email]
class = "logging.handlers.SMTPHandler" class = "logging.handlers.SMTPHandler"
filters = ["ratelimit"]
formatter = "simple" formatter = "simple"
mailhost = "bastion" mailhost = "bastion"
fromaddr = "fedmsg-migration-tools@fedoraproject.org" fromaddr = "fedmsg-migration-tools@fedoraproject.org"
@ -204,6 +212,9 @@ data:
[log_config] [log_config]
version = 1 version = 1
disable_existing_loggers = true disable_existing_loggers = true
[log_config.filters.ratelimit]
"()" = "fedmsg_migration_tools.config.RateLimiter"
rate = 120
[log_config.formatters.simple] [log_config.formatters.simple]
format = "%(asctime)s [%(name)s %(levelname)s] %(message)s" format = "%(asctime)s [%(name)s %(levelname)s] %(message)s"
datefmt = "%Y-%m-%d %H:%M:%S" datefmt = "%Y-%m-%d %H:%M:%S"
@ -214,6 +225,7 @@ data:
[log_config.handlers.email] [log_config.handlers.email]
class = "logging.handlers.SMTPHandler" class = "logging.handlers.SMTPHandler"
formatter = "simple" formatter = "simple"
filters = ["ratelimit"]
mailhost = "bastion" mailhost = "bastion"
fromaddr = "fedmsg-migration-tools@fedoraproject.org" fromaddr = "fedmsg-migration-tools@fedoraproject.org"
toaddrs = ["jcline@fedoraproject.org", "abompard@fedoraproject.org"] toaddrs = ["jcline@fedoraproject.org", "abompard@fedoraproject.org"]