use generic logger instead of rails logger

app/controllers/client_prefixes_controller.rb

@@ -82,6 +82,7 @@ def show
   end
 
   def create
+    logger = Logger.new(STDOUT)
     @client_prefix = ClientPrefix.new(safe_params)
     authorize! :create, @client_prefix
 
@@ -92,7 +93,7 @@ def create
 
       render json: ClientPrefixSerializer.new(@client_prefix, options).serialized_json, status: :created
     else
-      Rails.logger.warn @client_prefix.errors.inspect
+      logger.warn @client_prefix.errors.inspect
       render json: serialize(@client_prefix.errors), status: :unprocessable_entity
     end
   end

app/controllers/clients_controller.rb

@@ -74,6 +74,7 @@ def show
   end
 
   def create
+    logger = Logger.new(STDOUT)
     @client = Client.new(safe_params)
     authorize! :create, @client
 
@@ -83,37 +84,39 @@ def create
 
       render json: ClientSerializer.new(@client, options).serialized_json, status: :created
     else
-      Rails.logger.warn @client.errors.inspect
+      logger.warn @client.errors.inspect
       render json: serialize(@client.errors), status: :unprocessable_entity
     end
   end
 
   def update
+    logger = Logger.new(STDOUT)
     if @client.update_attributes(safe_params)
       options = {}
       options[:meta] = { dois: @client.cached_doi_count }
       options[:is_collection] = false
 
       render json: ClientSerializer.new(@client, options).serialized_json, status: :ok
     else
-      Rails.logger.warn @client.errors.inspect
+      logger.warn @client.errors.inspect
       render json: serialize(@client.errors), status: :unprocessable_entity
     end
   end
 
   # don't delete, but set deleted_at timestamp
   # a client with dois or prefixes can't be deleted
   def destroy
+    logger = Logger.new(STDOUT)
     if @client.dois.present?
       message = "Can't delete client that has DOIs."
       status = 400
-      Rails.logger.warn message
+      logger.warn message
       render json: { errors: [{ status: status.to_s, title: message }] }.to_json, status: status
     elsif @client.update_attributes(is_active: "\x00", deleted_at: Time.zone.now)
       @client.remove_users(id: "client_id", jwt: current_user.jwt) unless Rails.env.test?
       head :no_content
     else
-      Rails.logger.warn @client.errors.inspect
+      logger.warn @client.errors.inspect
       render json: serialize(@client.errors), status: :unprocessable_entity
     end
   end

app/controllers/dois_controller.rb

@@ -175,15 +175,16 @@ def show
   end
 
   def validate
-    # Rails.logger.info safe_params.inspect
+    logger = Logger.new(STDOUT)
+    # logger.info safe_params.inspect
     @doi = Doi.new(safe_params)
     authorize! :create, @doi
 
     if @doi.errors.present?
-      Rails.logger.info @doi.errors.inspect
+      logger.info @doi.errors.inspect
       render json: serialize(@doi.errors), status: :ok
     elsif @doi.validation_errors?
-      Rails.logger.info @doi.validation_errors.inspect
+      logger.info @doi.validation_errors.inspect
       render json: serialize(@doi.validation_errors), status: :ok
     else
       options = {}
@@ -195,15 +196,16 @@ def validate
   end
 
   def create
-   #  Rails.logger.info safe_params.inspect
-    @doi = Doi.new(safe_params.merge(event: safe_params[:event]))
+    logger = Logger.new(STDOUT)
+    logger.info safe_params.inspect
+    @doi = Doi.new(safe_params)
     authorize! :create, @doi
 
     # capture username and password for reuse in the handle system
     @doi.current_user = current_user
 
-    if safe_params[:xml] && @doi.aasm_state != "draft" && @doi.validation_errors?
-      Rails.logger.error @doi.validation_errors.inspect
+    if safe_params[:xml] && safe_params[:event] && @doi.validation_errors?
+      logger.error @doi.validation_errors.inspect
       render json: serialize(@doi.validation_errors), status: :unprocessable_entity
     elsif @doi.save
       options = {}
@@ -212,13 +214,14 @@ def create
 
       render json: DoiSerializer.new(@doi, options).serialized_json, status: :created, location: @doi
     else
-      Rails.logger.warn @doi.errors.inspect
+      logger.warn @doi.errors.inspect
       render json: serialize(@doi.errors), include: @include, status: :unprocessable_entity
     end
   end
 
   def update
-    #  Rails.logger.info safe_params.inspect
+    logger = Logger.new(STDOUT)
+    # logger.info safe_params.inspect
     @doi = Doi.where(doi: params[:id]).first
     exists = @doi.present?
 
@@ -236,17 +239,16 @@ def update
       doi_id = validate_doi(params[:id])
       fail ActiveRecord::RecordNotFound unless doi_id.present?
 
-      event = safe_params[:validate] ? "start" : safe_params[:event].presence || "start"
-      @doi = Doi.new(safe_params.merge(doi: doi_id, event: event))
+      @doi = Doi.new(safe_params.merge(doi: doi_id))
 
       authorize! :create, @doi
     end
 
     # capture username and password for reuse in the handle system
     @doi.current_user = current_user
 
-    if safe_params[:xml] && (@doi.aasm_state != "draft" || safe_params[:validate]) && @doi.validation_errors?
-      Rails.logger.error @doi.validation_errors.inspect
+    if safe_params[:xml] && (safe_params[:event] || safe_params[:validate]) && @doi.validation_errors?
+      logger.error @doi.validation_errors.inspect
       render json: serialize(@doi.validation_errors), status: :unprocessable_entity
     elsif @doi.save
       options = {}
@@ -255,19 +257,20 @@ def update
 
       render json: DoiSerializer.new(@doi, options).serialized_json, status: exists ? :ok : :created
     else
-      Rails.logger.warn @doi.errors.inspect
+      logger.warn @doi.errors.inspect
       render json: serialize(@doi.errors), include: @include, status: :unprocessable_entity
     end
   end
 
   def destroy
+    logger = Logger.new(STDOUT)
     authorize! :destroy, @doi
 
     if @doi.draft?
       if @doi.destroy
         head :no_content
       else
-        Rails.logger.warn @doi.errors.inspect
+        logger.warn @doi.errors.inspect
         render json: serialize(@doi.errors), status: :unprocessable_entity
       end
     else

app/controllers/media_controller.rb

@@ -51,6 +51,7 @@ def show
   end
 
   def create
+    logger = Logger.new(STDOUT)
     authorize! :update, @doi
 
     @media = Media.new(safe_params.merge(doi: @doi))
@@ -62,12 +63,13 @@ def create
 
       render json: MediaSerializer.new(@media, options).serialized_json, status: :created
     else
-      Rails.logger.warn @media.errors.inspect
+      logger.warn @media.errors.inspect
       render json: serialize(@media.errors), status: :unprocessable_entity
     end
   end
 
   def update
+    logger = Logger.new(STDOUT)
     authorize! :update, @doi
 
     if @media.update_attributes(safe_params.merge(doi: @doi))
@@ -77,18 +79,19 @@ def update
 
       render json: MediaSerializer.new(@media, options).serialized_json, status: :ok
     else
-      Rails.logger.warn @media.errors.inspect
+      logger.warn @media.errors.inspect
       render json: serialize(@media.errors), status: :unprocessable_entity
     end
   end
 
   def destroy
+    logger = Logger.new(STDOUT)
     authorize! :update, @doi
 
     if @media.destroy
       head :no_content
     else
-      Rails.logger.warn @media.errors.inspect
+      logger.warn @media.errors.inspect
       render json: serialize(@media.errors), status: :unprocessable_entity
     end
   end

app/controllers/metadata_controller.rb

@@ -54,6 +54,7 @@ def show
   end
 
   def create
+    logger = Logger.new(STDOUT)
     authorize! :update, @doi
 
     # convert back to plain xml
@@ -67,19 +68,20 @@ def create
 
       render json: MetadataSerializer.new(@metadata, options).serialized_json, status: :created
     else
-      Rails.logger.warn @metadata.errors.inspect
+      logger.warn @metadata.errors.inspect
       render json: serialize(@metadata.errors), status: :unprocessable_entity
     end
   end
 
   def destroy
+    logger = Logger.new(STDOUT)
     authorize! :update, @doi
 
     if @doi.draft?
       if @metadata.destroy
         head :no_content
       else
-        Rails.logger.warn @metadata.errors.inspect
+        logger.warn @metadata.errors.inspect
         render json: serialize(@metadata.errors), status: :unprocessable_entity
       end
     else

app/controllers/prefixes_controller.rb

@@ -117,6 +117,7 @@ def show
   end
 
   def create
+    logger = Logger.new(STDOUT)
     @prefix = Prefix.new(safe_params)
     authorize! :create, @prefix
 
@@ -127,7 +128,7 @@ def create
 
       render json: PrefixSerializer.new(@prefix, options).serialized_json, status: :created, location: @prefix
     else
-      Rails.logger.warn @prefix.errors.inspect
+      logger.warn @prefix.errors.inspect
       render json: serialize(@prefix.errors), status: :unprocessable_entity
     end
   end

app/controllers/provider_prefixes_controller.rb

@@ -116,6 +116,7 @@ def show
   end
 
   def create
+    logger = Logger.new(STDOUT)
     @provider_prefix = ProviderPrefix.new(safe_params)
     authorize! :create, @provider_prefix
 
@@ -126,7 +127,7 @@ def create
 
       render json: ProviderPrefixSerializer.new(@provider_prefix, options).serialized_json, status: :created
     else
-      Rails.logger.warn @provider_prefix.errors.inspect
+      logger.warn @provider_prefix.errors.inspect
       render json: serialize(@provider_prefix.errors), status: :unprocessable_entity
     end
   end

app/controllers/providers_controller.rb

@@ -75,8 +75,8 @@ def show
     render json: ProviderSerializer.new(@provider, options).serialized_json, status: :ok
   end
 
-  # POST /providers
   def create
+    logger = Logger.new(STDOUT)
     @provider = Provider.new(safe_params)
     authorize! :create, @provider
 
@@ -87,14 +87,14 @@ def create
 
       render json: ProviderSerializer.new(@provider, options).serialized_json, status: :ok
     else
-      Rails.logger.warn @provider.errors.inspect
+      logger.warn @provider.errors.inspect
       render json: serialize(@provider.errors), status: :unprocessable_entity
     end
   end
 
-  # PATCH/PUT /providers/1
   def update
-    Rails.logger.debug safe_params.inspect
+    logger = Logger.new(STDOUT)
+    # logger.debug safe_params.inspect
     if @provider.update_attributes(safe_params)
       options = {}
       options[:meta] = { 
@@ -106,24 +106,25 @@ def update
 
       render json: ProviderSerializer.new(@provider, options).serialized_json, status: :ok
     else
-      Rails.logger.warn @provider.errors.inspect
+      logger.warn @provider.errors.inspect
       render json: serialize(@provider.errors), status: :unprocessable_entity
     end
   end
 
   # don't delete, but set deleted_at timestamp
   # a provider with clients or prefixes can't be deleted
   def destroy
+    logger = Logger.new(STDOUT)
     if @provider.client_count.present?
       message = "Can't delete provider that has clients."
       status = 400
-      Rails.logger.warn message
+      logger.warn message
       render json: { errors: [{ status: status.to_s, title: message }] }.to_json, status: status
     elsif @provider.update_attributes(is_active: "\x00", deleted_at: Time.zone.now)
       @provider.remove_users(id: "provider_id", jwt: current_user.jwt) unless Rails.env.test?
       head :no_content
     else
-      Rails.logger.warn @provider.errors.inspect
+      logger.warn @provider.errors.inspect
       render json: serialize(@provider.errors), status: :unprocessable_entity
     end
   end

app/controllers/sessions_controller.rb

@@ -35,8 +35,9 @@ def reset
   private
 
   def error_response(message)
+    logger = Logger.new(STDOUT)
     status = 400
-    Rails.logger.info message
+    logger.info message
     render json: { errors: [{ status: status.to_s, title: message }] }.to_json, status: status
   end
 

app/models/provider.rb

@@ -154,7 +154,6 @@ def year
   end
 
   # def country=(value)
-  #   Rails.logger.debug value.inspect
   #   write_attribute(:country_code, value["code"]) if value.present?
   # end