From ef226a6f223ad3bdf662efb0ed75694b3f0bfb56 Mon Sep 17 00:00:00 2001
From: alpaca-tc <alpaca-tc@alpaca.tc>
Date: Tue, 9 May 2017 12:15:54 +0900
Subject: [PATCH] Remove rails_12factor (#2901)

---
 Gemfile                           | 1 -
 Gemfile.lock                      | 6 ------
 config/environments/production.rb | 5 +++++
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 47133345ea..3651ad8b07 100644
--- a/Gemfile
+++ b/Gemfile
@@ -98,6 +98,5 @@ end
 
 group :production do
   gem 'lograge'
-  gem 'rails_12factor'
   gem 'redis-rails'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 9269b779e1..1baf6bec5c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -318,11 +318,6 @@ GEM
       railties (~> 5.0)
     rails-settings-cached (0.6.5)
       rails (>= 4.2.0)
-    rails_12factor (0.0.3)
-      rails_serve_static_assets
-      rails_stdout_logging
-    rails_serve_static_assets (0.0.5)
-    rails_stdout_logging (0.0.5)
     railties (5.0.2)
       actionpack (= 5.0.2)
       activesupport (= 5.0.2)
@@ -528,7 +523,6 @@ DEPENDENCIES
   rails-controller-testing
   rails-i18n
   rails-settings-cached
-  rails_12factor
   redis (~> 3.2)
   redis-namespace
   redis-rails
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 2c13707c26..fa5f07495d 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -19,6 +19,11 @@ Rails.application.configure do
   # Apache or NGINX already handles this.
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
+  ActiveSupport::Logger.new(STDOUT).tap do |logger|
+    logger.formatter = config.log_formatter
+    config.logger = ActiveSupport::TaggedLogging.new(logger)
+  end
+
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = Uglifier.new(mangle: false)
   # config.assets.css_compressor = :sass