Use the app logger and require railtie

diff --git a/lib/google/api_client.rb b/lib/google/api_client.rb
index c79c71b58bf1ce05552e2d5f2a6119b5dd823cda..dc9c8537904e8f536f3be1fec412ff1c55641840 100644 (file)
--- a/lib/google/api_client.rb
+++ b/lib/google/api_client.rb
@@ -32,7 +32,7 @@ require 'google/api_client/service_account'
 require 'google/api_client/batch'
 require 'google/api_client/gzip'
 require 'google/api_client/client_secrets'
-require 'google/api_client/railtie' if defined?(Rails::Railtie)
+require 'google/api_client/railtie' if defined?(Rails)
 
 module Google
 

diff --git a/lib/google/api_client/railtie.rb b/lib/google/api_client/railtie.rb
index 703921b7ef76984ac20ff0121bc2911dda007a3f..d02e63456416470eddeac979613ffe6848bcdfa7 100644 (file)
--- a/lib/google/api_client/railtie.rb
+++ b/lib/google/api_client/railtie.rb
@@ -1,3 +1,4 @@
+require 'rails/railtie'
 require 'google/api_client/logging'
 
 module Google
@@ -9,7 +10,7 @@ module Google
     #
     class Railtie < Rails::Railtie
       initializer 'google-api-client' do |app|
-        Google::APIClient.logger = Rails.logger
+        Google::APIClient.logger = app.logger
       end
     end
   end