From efa42e9668608f5175eb5c96898e199640d26434 Mon Sep 17 00:00:00 2001 From: Evandro Junior Date: Wed, 29 Jul 2015 21:49:46 -0300 Subject: [PATCH] workaround for the api logger --- lib/noosfero/api/helpers.rb | 10 ++++------ test/unit/api/helpers_test.rb | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/noosfero/api/helpers.rb b/lib/noosfero/api/helpers.rb index 49d735b..f801f7e 100644 --- a/lib/noosfero/api/helpers.rb +++ b/lib/noosfero/api/helpers.rb @@ -40,7 +40,9 @@ require 'grape' end def logger - Noosfero::API::API.logger + logger = Logger.new(File.join(Rails.root, 'log', "#{ENV['RAILS_ENV'] || 'production'}_api.log")) + logger.formatter = GrapeLogging::Formatters::Default.new + logger end def limit @@ -251,11 +253,7 @@ require 'grape' log_msg = "#{log_message}, #{log_msg}" if log_message.present? log_msg = "#{log_msg}, Javascript Console Message: #{javascript_console_message}" if javascript_console_message.present? logger.error log_msg unless Rails.env.test? - if javascript_console_message.present? - error!(message_hash, status) - else - error!({'message' => user_message, :code => status}, status) - end + error!(message_hash, status) end def render_api_errors!(messages) diff --git a/test/unit/api/helpers_test.rb b/test/unit/api/helpers_test.rb index 53ab562..dae8a80 100644 --- a/test/unit/api/helpers_test.rb +++ b/test/unit/api/helpers_test.rb @@ -264,7 +264,7 @@ should 'captcha serpro say name or service not known' do params[:txtToken_captcha_serpro_gov_br] = '4324343' params[:captcha_text] = '4324343' r = test_captcha('127.0.0.1', params, environment) - assert_equal(_("Serpro captcha error: getaddrinfo: Name or service not known"), r[0][:javascript_console_message]) + assert (r[0][:javascript_console_message]).starts_with?("Serpro captcha error: getaddrinfo") end ###### END Captcha tests ###### -- libgit2 0.21.2