From f4be378e230544350a53039e8d0201387ae92c71 Mon Sep 17 00:00:00 2001
From: Wonderfall <wonderfall@schrodinger.io>
Date: Tue, 13 Jun 2017 22:35:21 +0200
Subject: [PATCH] mastodon: redirect logs to files

---
 mastodon/rootfs/etc/s6.d/sidekiq/run   |  2 +-
 mastodon/rootfs/etc/s6.d/streaming/run |  2 +-
 mastodon/rootfs/etc/s6.d/web/run       |  2 +-
 mastodon/rootfs/usr/local/bin/run      | 10 +++++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/mastodon/rootfs/etc/s6.d/sidekiq/run b/mastodon/rootfs/etc/s6.d/sidekiq/run
index e075fbd..ff6aac6 100644
--- a/mastodon/rootfs/etc/s6.d/sidekiq/run
+++ b/mastodon/rootfs/etc/s6.d/sidekiq/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 cd /mastodon
-exec bundle exec sidekiq -c $SIDEKIQ_WORKERS -q default -q push -q pull -q mailers
+exec bundle exec sidekiq -c $SIDEKIQ_WORKERS -q default -q push -q pull -q mailers > ./log/sidekiq.log 2>&1
diff --git a/mastodon/rootfs/etc/s6.d/streaming/run b/mastodon/rootfs/etc/s6.d/streaming/run
index 6e4c24f..372bc8a 100644
--- a/mastodon/rootfs/etc/s6.d/streaming/run
+++ b/mastodon/rootfs/etc/s6.d/streaming/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 cd /mastodon
-exec npm run start
+exec npm run start > ./log/streaming.log 2>&1
diff --git a/mastodon/rootfs/etc/s6.d/web/run b/mastodon/rootfs/etc/s6.d/web/run
index d9ac3f2..ec827bd 100644
--- a/mastodon/rootfs/etc/s6.d/web/run
+++ b/mastodon/rootfs/etc/s6.d/web/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 cd /mastodon
-exec bundle exec rails s -p 3000 -b '0.0.0.0'
+exec bundle exec puma -C config/puma.rb > ./log/web.log 2>&1
diff --git a/mastodon/rootfs/usr/local/bin/run b/mastodon/rootfs/usr/local/bin/run
index f9f585f..d021517 100644
--- a/mastodon/rootfs/usr/local/bin/run
+++ b/mastodon/rootfs/usr/local/bin/run
@@ -18,9 +18,17 @@ A GNU Social-compatible microblogging server
    https://github.com/tootsuite/mastodon
     17j2g7vpgHhLuXhN4bueZFCvdxxieyRVWd
 ---------------------------------------------
+UID/GID settings
+---------------------------------------------
 User  ID : ${UID}
 Group ID : ${GID}
 ---------------------------------------------
+Logs location
+---------------------------------------------
+Sidekiq   : /mastodon/log/sidekiq.log
+Streaming : /mastodon/log/streaming.log
+Web       : /mastodon/log/web.log
+---------------------------------------------
 "
 
 echo "Creating mastodon user..."
@@ -40,7 +48,7 @@ if [ "$RUN_DB_MIGRATIONS" == "true" ]; then
   su-exec mastodon:mastodon rake db:migrate
 fi
 
-echo "Executing process..."
+echo "Executing process(es)..."
 if [ '$@' == '' ]; then
     exec su-exec mastodon:mastodon /bin/s6-svscan /etc/s6.d
 else