Merge branch 'master' of https://github.com/google/google-api-ruby-client

diff --git a/lib/google/api_client/railtie.rb b/lib/google/api_client/railtie.rb
index d02e63456416470eddeac979613ffe6848bcdfa7..51edb33b5153edd7420443e044c36b8276bdbcf6 100644 (file)
--- a/lib/google/api_client/railtie.rb
+++ b/lib/google/api_client/railtie.rb
@@ -10,7 +10,13 @@ module Google
     #
     class Railtie < Rails::Railtie
       initializer 'google-api-client' do |app|
-        Google::APIClient.logger = app.logger
+        _logger = case
+                    when app.respond_to?(:logger)        then app.logger
+                    when app.config.respond_to?(:logger) then app.config.logger
+                    else                                      Rails.logger
+                  end
+                  
+        Google::APIClient.logger = _logger
       end
     end
   end