From d4f49e6556c073c0476558e7439d1d69c67227f3 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Fri, 17 Jul 2020 16:58:42 +0500 Subject: [PATCH] Revert "Introduce log_dir env variable for truemail and require it with figaro." This reverts commit 76eed1ef08b7399d1001153287ef7066084ab424. --- config/application.yml.sample | 3 --- config/initializers/figaro.rb | 1 - config/initializers/truemail.rb | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/config/application.yml.sample b/config/application.yml.sample index 820020c83..691740b2a 100644 --- a/config/application.yml.sample +++ b/config/application.yml.sample @@ -4,9 +4,6 @@ # # Be sure to restart your server when you modify settings. # -# Log directory for gems not using syslog -log_dir: /home/app/current/log - # # SMTP configuration (for Admin/EPP/Registrar/Registrant servers) diff --git a/config/initializers/figaro.rb b/config/initializers/figaro.rb index e873fa39d..c057f8eee 100644 --- a/config/initializers/figaro.rb +++ b/config/initializers/figaro.rb @@ -5,5 +5,4 @@ Figaro.require_keys(%w[ time_zone action_mailer_default_host action_mailer_default_from - log_dir ]) diff --git a/config/initializers/truemail.rb b/config/initializers/truemail.rb index 1f694a79b..18527d26c 100644 --- a/config/initializers/truemail.rb +++ b/config/initializers/truemail.rb @@ -72,6 +72,6 @@ Truemail.configure do |config| # stdout, write to file or both of these. Tracking event by default is :error # Available tracking event: :all, :unrecognized_error, :recognized_error, :error unless Rails.env.test? - config.logger = { tracking_event: :all, stdout: true, log_absolute_path: "#{ENV['log_dir']}/truemail.log" } + config.logger = { tracking_event: :all, stdout: true, log_absolute_path: Rails.root.join('log', 'truemail.log') } end end