Merge 304d2e3 into 713b3a4

.ruby-version

@@ -1 +1 @@
-2.6.4
+2.6.5

.travis.yml

@@ -1,7 +1,5 @@
 sudo: false
 language: ruby
-rvm:
-  - 2.6.4
 cache:
   bundler: true
 services:

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "2.6.4"
+ruby "2.6.5"
 
 gem "rails", "~> 5.2.3"
 gem "active_model_serializers"

Gemfile.lock

@@ -342,7 +342,7 @@ DEPENDENCIES
   xml-simple
 
 RUBY VERSION
-   ruby 2.6.4p104
+   ruby 2.6.5p114
 
 BUNDLED WITH
    1.17.3

config/application.rb

@@ -17,7 +17,11 @@
 module CasAuthenticatedApi
   class Application < Rails::Application
     # Enable ougai
-    config.logger = Log::Logger.new(Rails.root.join("log", "datadog.log"))
+    if Rails.env.development? || Rails.const_defined?("Console")
+      config.logger = Log::Logger.new(STDOUT)
+    elsif !Rails.env.test? # use default logger in test env
+      config.logger = Log::Logger.new(Rails.root.join("log", "datadog.log"))
+    end
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 5.2
 

lib/log/logger.rb

@@ -7,12 +7,13 @@ class Logger < Ougai::Logger
     include LoggerSilence
 
     def initialize(*args)
+      @readable = args[0] == STDOUT
       super
       after_initialize if respond_to? :after_initialize
     end
 
     def create_formatter
-      if Rails.env.development? || Rails.env.test?
+      if @readable
         Log::Logger::FormatterReadable.new(STDOUT)
       else
         Log::Logger::Formatter.new(ENV["PROJECT_NAME"])