diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 7d8008eb46..37122606da 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -52,6 +52,9 @@ wildcard_cert_name: wildcard-2014.fedoraproject.org # By default, nodes get no fedmsg certs. They need to declare them explicitly. fedmsg_certs: [] +# By default, fedmsg should not log debug info. Groups can override this. +fedmsg_loglevel: INFO + # By default, nodes don't backup any dbs on them unless they declare it. dbs_to_backup: [] diff --git a/inventory/group_vars/notifs-backend b/inventory/group_vars/notifs-backend index c138890860..6d325e28cb 100644 --- a/inventory/group_vars/notifs-backend +++ b/inventory/group_vars/notifs-backend @@ -11,6 +11,10 @@ tcp_ports: [ 3000, 3001, 3002, 3003, 3004 ] fas_client_groups: sysadmin-noc,sysadmin-datanommer + +# For performance measurement.. for now. This can be removed whenever. +fedmsg_loglevel: DEBUG + # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell diff --git a/roles/fedmsg/base/templates/logging.py.j2 b/roles/fedmsg/base/templates/logging.py.j2 index 36c1c2bd92..452ea8b235 100644 --- a/roles/fedmsg/base/templates/logging.py.j2 +++ b/roles/fedmsg/base/templates/logging.py.j2 @@ -126,7 +126,7 @@ config = dict( console={ "class": "logging.StreamHandler", "formatter": "bare", - "level": "INFO", + "level": "{{fedmsg_loglevel}}", "stream": "ext://sys.stdout", }, mailer={ @@ -142,12 +142,12 @@ config = dict( ), loggers=dict( fedmsg={ - "level": "INFO", + "level": "{{fedmsg_loglevel}}", "propagate": False, "handlers": ["console", "mailer"], }, moksha={ - "level": "INFO", + "level": "{{fedmsg_loglevel}}", "propagate": False, "handlers": ["console", "mailer"], },