summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--roles/fedmsg/base/templates/logging.py.j22
-rw-r--r--roles/mbs/common/tasks/main.yml7
2 files changed, 5 insertions, 4 deletions
diff --git a/roles/fedmsg/base/templates/logging.py.j2 b/roles/fedmsg/base/templates/logging.py.j2
index d7fe83dcf..4be3fd991 100644
--- a/roles/fedmsg/base/templates/logging.py.j2
+++ b/roles/fedmsg/base/templates/logging.py.j2
@@ -237,13 +237,11 @@ config = dict(
"handlers": ["console", "mailer"],
},
),
- {% if not inventory_hostname.startswith('mbs-backend') %}
# Root handler that deals with log messages that are not handled by the
# loggers explicitly configured in the `loggers` dict.
root={
"level": "{{fedmsg_loglevel}}",
"handlers": ["console", "mailer"],
},
- {% endif %}
),
)
diff --git a/roles/mbs/common/tasks/main.yml b/roles/mbs/common/tasks/main.yml
index 0c2e57042..098069b52 100644
--- a/roles/mbs/common/tasks/main.yml
+++ b/roles/mbs/common/tasks/main.yml
@@ -15,8 +15,11 @@
- mbs
- mbs/common
-- name: kill development config
- file: path=/etc/fedmsg.d/module_build_service.py state=absent
+- name: kill development configs
+ file: path=/etc/fedmsg.d/{{ item }} state=absent
+ with_items:
+ - module_build_service.py
+ - mbs-logging.py
notify:
- restart apache
- restart fedmsg-hub