Merge branch 'master' of https://github.com/datacite/lupo

app/controllers/client_prefixes_controller.rb

@@ -89,7 +89,7 @@ def create
 
       render json: ClientPrefixSerializer.new(@client_prefix, options).serialized_json, status: :created
     else
-      logger.error @client_prefix.errors.inspect
+      Rails.logger.error @client_prefix.errors.inspect
       render json: serialize_errors(@client_prefix.errors), status: :unprocessable_entity
     end
   end

app/controllers/clients_controller.rb

@@ -115,7 +115,7 @@ def create
 
       render json: ClientSerializer.new(@client, options).serialized_json, status: :created
     else
-      logger.error @client.errors.inspect
+      Rails.logger.error @client.errors.inspect
       render json: serialize_errors(@client.errors), status: :unprocessable_entity
     end
   end
@@ -129,7 +129,7 @@ def update
 
       render json: ClientSerializer.new(@client, options).serialized_json, status: :ok
     else
-      logger.error @client.errors.inspect
+      Rails.logger.error @client.errors.inspect
       render json: serialize_errors(@client.errors), status: :unprocessable_entity
     end
   end
@@ -140,13 +140,13 @@ def destroy
     if @client.dois.present?
       message = "Can't delete client that has DOIs."
       status = 400
-      logger.warn message
+      Rails.logger.warn message
       render json: { errors: [{ status: status.to_s, title: message }] }.to_json, status: status
     elsif @client.update(is_active: nil, deleted_at: Time.zone.now)
       @client.send_delete_email unless Rails.env.test?
       head :no_content
     else
-      logger.error @client.errors.inspect
+      Rails.logger.error @client.errors.inspect
       render json: serialize_errors(@client.errors), status: :unprocessable_entity
     end
   end

app/controllers/graphql_controller.rb

@@ -34,8 +34,8 @@ def ensure_hash(ambiguous_param)
   end
 
   def handle_error_in_development(e)
-    logger.error e.message
-    logger.error e.backtrace.join("\n")
+    Rails.logger.error e.message
+    Rails.logger.error e.backtrace.join("\n")
 
     render json: { error: { message: e.message, backtrace: e.backtrace }, data: {} }, status: 500
   end

app/controllers/media_controller.rb

@@ -60,7 +60,7 @@ def create
 
       render json: MediaSerializer.new(@media, options).serialized_json, status: :created
     else
-      logger.error @media.errors.inspect
+      Rails.logger.error @media.errors.inspect
       render json: serialize_errors(@media.errors), status: :unprocessable_entity
     end
   end
@@ -75,7 +75,7 @@ def update
 
       render json: MediaSerializer.new(@media, options).serialized_json, status: :ok
     else
-      logger.error @media.errors.inspect
+      Rails.logger.error @media.errors.inspect
       render json: serialize_errors(@media.errors), status: :unprocessable_entity
     end
   end
@@ -86,7 +86,7 @@ def destroy
     if @media.destroy
       head :no_content
     else
-      logger.error @media.errors.inspect
+      Rails.logger.error @media.errors.inspect
       render json: serialize_errors(@media.errors), status: :unprocessable_entity
     end
   end

app/controllers/metadata_controller.rb

@@ -65,7 +65,7 @@ def create
 
       render json: MetadataSerializer.new(@metadata, options).serialized_json, status: :created
     else
-      logger.error @metadata.errors.inspect
+      Rails.logger.error @metadata.errors.inspect
       render json: serialize_errors(@metadata.errors), status: :unprocessable_entity
     end
   end
@@ -77,7 +77,7 @@ def destroy
       if @metadata.destroy
         head :no_content
       else
-        logger.error @metadata.errors.inspect
+        Rails.logger.error @metadata.errors.inspect
         render json: serialize_errors(@metadata.errors), status: :unprocessable_entity
       end
     else

app/controllers/provider_prefixes_controller.rb

@@ -123,7 +123,7 @@ def create
 
       render json: ProviderPrefixSerializer.new(@provider_prefix, options).serialized_json, status: :created
     else
-      logger.error @provider_prefix.errors.inspect
+      Rails.logger.error @provider_prefix.errors.inspect
       render json: serialize_errors(@provider_prefix.errors), status: :unprocessable_entity
     end
   end

app/controllers/providers_controller.rb

@@ -211,7 +211,7 @@ def create
 
       render json: ProviderSerializer.new(@provider, options).serialized_json, status: :ok
     else
-      logger.error @provider.errors.inspect
+      Rails.logger.error @provider.errors.inspect
       render json: serialize_errors(@provider.errors), status: :unprocessable_entity
     end
   end
@@ -243,7 +243,7 @@ def update
 
       render json: ProviderSerializer.new(@provider, options).serialized_json, status: :ok
     else
-      logger.error @provider.errors.inspect
+      Rails.logger.error @provider.errors.inspect
       render json: serialize_errors(@provider.errors), status: :unprocessable_entity
     end
   end
@@ -254,13 +254,13 @@ def destroy
     if active_client_count(provider_id: @provider.symbol).positive?
       message = "Can't delete provider that has active clients."
       status = 400
-      logger.warn message
+      Rails.logger.warn message
       render json: { errors: [{ status: status.to_s, title: message }] }.to_json, status: status
     elsif @provider.update_attributes(is_active: nil, deleted_at: Time.zone.now)
       @provider.send_delete_email unless Rails.env.test?
       head :no_content
     else
-      logger.error @provider.errors.inspect
+      Rails.logger.error @provider.errors.inspect
       render json: serialize_errors(@provider.errors), status: :unprocessable_entity
     end
   end

app/controllers/repositories_controller.rb

@@ -141,7 +141,7 @@ def create
 
       render json: RepositorySerializer.new(@client, options).serialized_json, status: :created
     else
-      logger.error @client.errors.inspect
+      Rails.logger.error @client.errors.inspect
       render json: serialize_errors(@client.errors), status: :unprocessable_entity
     end
   end
@@ -155,7 +155,7 @@ def update
 
       render json: RepositorySerializer.new(@client, options).serialized_json, status: :ok
     else
-      logger.error @client.errors.inspect
+      Rails.logger.error @client.errors.inspect
       render json: serialize_errors(@client.errors), status: :unprocessable_entity
     end
   end
@@ -166,13 +166,13 @@ def destroy
     if @client.dois.present?
       message = "Can't delete repository that has DOIs."
       status = 400
-      logger.warn message
+      Rails.logger.warn message
       render json: { errors: [{ status: status.to_s, title: message }] }.to_json, status: status
     elsif @client.update_attributes(is_active: nil, deleted_at: Time.zone.now)
       @client.send_delete_email unless Rails.env.test?
       head :no_content
     else
-      logger.error @client.errors.inspect
+      Rails.logger.error @client.errors.inspect
       render json: serialize_errors(@client.errors), status: :unprocessable_entity
     end
   end

app/controllers/repository_prefixes_controller.rb

@@ -89,7 +89,7 @@ def create
 
       render json: RepositoryPrefixSerializer.new(@client_prefix, options).serialized_json, status: :created
     else
-      logger.error @client_prefix.errors.inspect
+      Rails.logger.error @client_prefix.errors.inspect
       render json: serialize_errors(@client_prefix.errors), status: :unprocessable_entity
     end
   end

app/models/activity.rb

@@ -220,21 +220,21 @@ def self.import_by_id(options={})
       # log errors
       errors += response['items'].map { |k, v| k.values.first['error'] }.compact.length
       response['items'].select { |k, v| k.values.first['error'].present? }.each do |err|
-        logger.error "[Elasticsearch] " + err.inspect
+        Rails.logger.error "[Elasticsearch] " + err.inspect
       end
 
       count += activities.length
     end
 
     if errors > 1
-      logger.error "[Elasticsearch] #{errors} errors importing #{count} activities with IDs #{id} - #{(id + 499)}."
+      Rails.logger.error "[Elasticsearch] #{errors} errors importing #{count} activities with IDs #{id} - #{(id + 499)}."
     elsif count > 0
-      logger.info "[Elasticsearch] Imported #{count} activities with IDs #{id} - #{(id + 499)}."
+      Rails.logger.info "[Elasticsearch] Imported #{count} activities with IDs #{id} - #{(id + 499)}."
     end
 
     count
   rescue Elasticsearch::Transport::Transport::Errors::RequestEntityTooLarge, Faraday::ConnectionFailed, ActiveRecord::LockWaitTimeout => error
-    logger.error "[Elasticsearch] Error #{error.message} importing activities with IDs #{id} - #{(id + 499)}."
+    Rails.logger.error "[Elasticsearch] Error #{error.message} importing activities with IDs #{id} - #{(id + 499)}."
 
     count = 0
 
@@ -243,7 +243,7 @@ def self.import_by_id(options={})
       count += 1
     end
 
-    logger.info "[Elasticsearch] Imported #{count} activities with IDs #{id} - #{(id + 499)}."
+    Rails.logger.info "[Elasticsearch] Imported #{count} activities with IDs #{id} - #{(id + 499)}."
 
     count
   end
@@ -315,11 +315,11 @@ def self.convert_affiliation_by_id(options={})
       end
     end
 
-    logger.info "[Elasticsearch] Converted affiliations for #{count} activities with IDs #{id} - #{(id + 499)}." if count > 0
+    Rails.logger.info "[Elasticsearch] Converted affiliations for #{count} activities with IDs #{id} - #{(id + 499)}." if count > 0
 
     count
   rescue Elasticsearch::Transport::Transport::Errors::RequestEntityTooLarge, Faraday::ConnectionFailed, ActiveRecord::LockWaitTimeout => error
-    logger.info "[Elasticsearch] Error #{error.message} converting affiliations for DOIs with IDs #{id} - #{(id + 499)}."
+    Rails.logger.info "[Elasticsearch] Error #{error.message} converting affiliations for DOIs with IDs #{id} - #{(id + 499)}."
   end
 
   def uid

app/models/concerns/crosscitable.rb

@@ -51,8 +51,8 @@ def parse_xml(input, options={})
     rescue NoMethodError, ArgumentError => exception
       Raven.capture_exception(exception)
 
-      logger.error "Error " + exception.message + " for doi " + @doi + "."
-      logger.error exception
+      Rails.logger.error "Error " + exception.message + " for doi " + @doi + "."
+      Rails.logger.error exception
 
       {}
     end
@@ -117,8 +117,8 @@ def clean_xml(string)
       doc = Nokogiri::XML(string) { |config| config.strict.noblanks }
       doc.to_xml
     rescue ArgumentError, Encoding::CompatibilityError => exception
-      logger.error "Error " + exception.message + "."
-      logger.error exception
+      Rails.logger.error "Error " + exception.message + "."
+      Rails.logger.error exception
 
       nil
     end

app/models/concerns/helpable.rb

@@ -14,12 +14,12 @@ module Helpable
 
     def register_url
       unless url.present?
-        logger.error "[Handle] Error updating DOI " + doi + ": url missing."
+        Rails.logger.error "[Handle] Error updating DOI " + doi + ": url missing."
         return OpenStruct.new(body: { "errors" => [{ "title" => "URL missing." }] })
       end
 
       unless client_id.present?
-        logger.error "[Handle] Error updating DOI " + doi + ": client ID missing."
+        Rails.logger.error "[Handle] Error updating DOI " + doi + ": client ID missing."
         return OpenStruct.new(body: { "errors" => [{ "title" => "Client ID missing." }] })
       end
 
@@ -56,11 +56,11 @@ def register_url
       if [200, 201].include?(response.status)
         # update minted column after first successful registration in handle system
         self.update_attributes(minted: Time.zone.now, updated: Time.zone.now) if minted.blank?
-        logger.info "[Handle] URL for DOI " + doi + " updated to " + url + "." unless Rails.env.test?
+        Rails.logger.info "[Handle] URL for DOI " + doi + " updated to " + url + "." unless Rails.env.test?
 
         self.__elasticsearch__.index_document
       else
-        logger.error "[Handle] Error updating URL for DOI " + doi + ": " + response.body.inspect unless Rails.env.test?
+        Rails.logger.error "[Handle] Error updating URL for DOI " + doi + ": " + response.body.inspect unless Rails.env.test?
       end
 
       response
@@ -71,7 +71,7 @@ def get_url
       response = Maremma.get(url, ssl_self_signed: true, timeout: 10)
 
       if response.status != 200
-        logger.error "[Handle] Error fetching URL for DOI " + doi + ": " + response.body.inspect unless Rails.env.test?
+        Rails.logger.error "[Handle] Error fetching URL for DOI " + doi + ": " + response.body.inspect unless Rails.env.test?
       end
 
       response
@@ -142,13 +142,13 @@ def get_dois(options={})
           else
             text = "Error " + response.body["errors"].inspect
 
-            logger.error "[Handle] " + text
+            Rails.logger.error "[Handle] " + text
             User.send_notification_to_slack(text, title: "Error #{response.status.to_s}", level: "danger") unless Rails.env.test?
           end
         end
       end
 
-      logger.info "#{total} DOIs found."
+      Rails.logger.info "#{total} DOIs found."
 
       dois
     end
@@ -163,7 +163,7 @@ def get_doi(options={})
       if response.status != 200
         text = "Error " + response.body["errors"].inspect
 
-        logger.error "[Handle] " + text
+        Rails.logger.error "[Handle] " + text
         User.send_notification_to_slack(text, title: "Error #{response.status.to_s}", level: "danger") unless Rails.env.test?
       end
 
@@ -182,7 +182,7 @@ def delete_doi(options={})
       else
         text = "Error " + response.body["errors"].inspect
 
-        logger.error "[Handle] " + text
+        Rails.logger.error "[Handle] " + text
         User.send_notification_to_slack(text, title: "Error #{response.status.to_s}", level: "danger") unless Rails.env.test?
         response
       end