From ad99a8c26433ef4f74ef15dcec583677b8ef0c7d Mon Sep 17 00:00:00 2001
From: Stefan Sundin <git@stefansundin.com>
Date: Tue, 2 Feb 2021 22:46:04 -0800
Subject: [PATCH] Enable clogger again, with an option to only send to a file.

---
 Gemfile                           |  2 +-
 Gemfile.lock                      |  3 +++
 Vagrantfile                       |  2 +-
 config/initializers/05-logging.rb | 26 +++++++++++++++++---------
 config/puma.rb                    |  2 +-
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5d4ef23..9f40028 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ gem "redis"
 gem "addressable"
 gem "rack-ssl-enforcer"
 gem "secure_headers"
-# gem "clogger"
+gem "clogger"
 gem "heroku-env"
 gem "tzinfo"
 gem "nokogiri"
diff --git a/Gemfile.lock b/Gemfile.lock
index c77101a..9ee20d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,6 +14,8 @@ GEM
       airbrake-ruby (~> 5.1)
     airbrake-ruby (5.2.0)
       rbtree3 (~> 0.5)
+    clogger (2.3.0)
+      rack (>= 1.0, < 3.0)
     coderay (1.1.3)
     concurrent-ruby (1.1.8)
     crass (1.0.6)
@@ -91,6 +93,7 @@ PLATFORMS
 DEPENDENCIES
   addressable
   airbrake
+  clogger
   dotenv
   feedjira
   github-release-party
diff --git a/Vagrantfile b/Vagrantfile
index f4443fd..e2e3280 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -13,7 +13,7 @@ $env = <<SCRIPT
 PATH=/home/vagrant/.rbenv/bin:/home/vagrant/.rbenv/versions/global/bin:/home/vagrant/.rbenv/versions/global/lib/ruby/gems/version/bin:$PATH
 
 APP_ENV=production
-LOG_ENABLED=1
+LOGFILE=1
 
 REDIS_URL=redis://localhost:6379/3
 #TWITTER_ACCESS_TOKEN=
diff --git a/config/initializers/05-logging.rb b/config/initializers/05-logging.rb
index 889a52c..adebfde 100644
--- a/config/initializers/05-logging.rb
+++ b/config/initializers/05-logging.rb
@@ -1,14 +1,22 @@
 # frozen_string_literal: true
 
-# disable Sinatra's logger
-if defined?(Clogger) || ENV["DISABLE_ACCESS_LOG"]
+if ENV.has_key?("CLOGGER")
+  # disable Sinatra's logger
   disable :logging
-end
 
-# https://bogomips.org/clogger/
-# this format is similar to "Combined", but without $time_local and $http_user_agent (and using $ip instead of $remote_addr)
-# removing time and user-agent saves ~50% on log filesize
-# the purpose of ~ is to allow for easier grepping with -E '^~' (i.e. filtering out exceptions and other crap)
-if defined?(Clogger) && !ENV["DISABLE_ACCESS_LOG"]
-  use Clogger, logger: $stdout, reentrant: true, format: '~ $ip "$request" $status $response_length "$http_referer"'
+  # https://yhbt.net/clogger/
+  # this format is similar to "Combined", but without $time_local and $http_user_agent (and using $ip instead of $remote_addr)
+  # Combined: $remote_addr - $remote_user [$time_local] $request" $status $response_length "$http_referer" "$http_user_agent"
+  # removing time and user-agent saves ~50% on log filesize
+  # the purpose of ~ is to allow for easier grepping with -E '^~' (i.e. filtering out exceptions and other crap)
+  opts = {
+    reentrant: true,
+    format: ENV["CLOGGER_FORMAT"] || '~ $ip "$request" $status $response_length "$http_referer"',
+  }
+  if ENV.has_key?("CLOGGER_FILE")
+    opts[:path] = ENV["CLOGGER_FILE"]
+  else
+    opts[:logger] = $stdout
+  end
+  use Clogger, opts
 end
diff --git a/config/puma.rb b/config/puma.rb
index b961f86..df3d5e4 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -18,7 +18,7 @@
   port(ENV["PORT"])
 end
 
-if ENV["LOG_ENABLED"]
+if ENV.has_key?("LOGFILE")
   stdout_redirect("#{app_path}/log/puma-stdout.log", "#{app_path}/log/puma-stderr.log", true)
 end