From 6654e0b9714c87e46809e71bc5fe065817187ef0 Mon Sep 17 00:00:00 2001
From: waffles <waffles@yttrx.com>
Date: Wed, 18 Jan 2023 22:56:13 -0800
Subject: [PATCH] Send docker logs to journald

---
 roles/mastodon/templates/docker-compose.yml.j2        | 4 ++++
 roles/sidekiq/templates/docker-compose.sidekiq.yml.j2 | 2 ++
 roles/webapp/templates/docker-compose.override.yml.j2 | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/roles/mastodon/templates/docker-compose.yml.j2 b/roles/mastodon/templates/docker-compose.yml.j2
index 45a0ce7..84ae486 100644
--- a/roles/mastodon/templates/docker-compose.yml.j2
+++ b/roles/mastodon/templates/docker-compose.yml.j2
@@ -2,6 +2,8 @@ version: '3'
 services:
 {% if ENV_PRODUCTION['STATSD_ADDR'] is defined %}
   statsd:
+    logging:
+      driver: journald
     restart: always
     image: prom/statsd-exporter
     command: --statsd.mapping-config=/tmp/statsd_mapping.yml
@@ -15,6 +17,8 @@ services:
       - "127.0.0.1:9125:9125"
 {% endif %}
   pgbouncer:
+    logging:
+      driver: journald
     restart: always
     image: edoburu/pgbouncer
     networks:
diff --git a/roles/sidekiq/templates/docker-compose.sidekiq.yml.j2 b/roles/sidekiq/templates/docker-compose.sidekiq.yml.j2
index 3e27831..f16e905 100644
--- a/roles/sidekiq/templates/docker-compose.sidekiq.yml.j2
+++ b/roles/sidekiq/templates/docker-compose.sidekiq.yml.j2
@@ -1,6 +1,8 @@
 services:
 {% for SK in sidekiq %}
   sidekiq-{{ SK['name'] }}:
+    logging:
+      driver: journald
     image: tootsuite/mastodon:{{ MASTODON_VERSION }}
     restart: always
     env_file: .env.production
diff --git a/roles/webapp/templates/docker-compose.override.yml.j2 b/roles/webapp/templates/docker-compose.override.yml.j2
index 1c26e00..6fea9aa 100644
--- a/roles/webapp/templates/docker-compose.override.yml.j2
+++ b/roles/webapp/templates/docker-compose.override.yml.j2
@@ -1,6 +1,8 @@
 version: '3'
 services:
   web:
+    logging:
+      driver: journald
     image: tootsuite/mastodon:v4.0.2
     restart: always
     env_file: .env.production
@@ -21,6 +23,8 @@ services:
       - ./public/system:/mastodon/public/system
 
   streaming:
+    logging:
+      driver: journald
     image: tootsuite/mastodon:v4.0.2
     restart: always
     env_file: .env.production