Kouhei Sutou
null+****@clear*****
Tue Dec 30 15:40:23 JST 2014
Kouhei Sutou 2014-12-30 15:40:23 +0900 (Tue, 30 Dec 2014) New Revision: ad808473a3cce4b8db2c799f34540e952fb59f88 https://github.com/groonga/groonga/commit/ad808473a3cce4b8db2c799f34540e952fb59f88 Message: Don't log error class name in Ruby Added files: lib/mrb/scripts/error.rb Modified files: lib/mrb/scripts/initialize/post.rb lib/mrb/scripts/logger.rb lib/mrb/scripts/scan_info_builder.rb lib/mrb/scripts/scan_info_data.rb lib/mrb/scripts/sources.am test/command/suite/select/filter/invalid/match/argument/column.expected Added: lib/mrb/scripts/error.rb (+4 -0) 100644 =================================================================== --- /dev/null +++ lib/mrb/scripts/error.rb 2014-12-30 15:40:23 +0900 (576a89b) @@ -0,0 +1,4 @@ +module Groonga + class ErrorMessage < Error + end +end Modified: lib/mrb/scripts/initialize/post.rb (+2 -0) =================================================================== --- lib/mrb/scripts/initialize/post.rb 2014-12-30 12:34:46 +0900 (bd50a1e) +++ lib/mrb/scripts/initialize/post.rb 2014-12-30 15:40:23 +0900 (95f71b8) @@ -1,3 +1,5 @@ +require "error" + require "database" require "table_cursor" Modified: lib/mrb/scripts/logger.rb (+5 -1) =================================================================== --- lib/mrb/scripts/logger.rb 2014-12-30 12:34:46 +0900 (06f99c1) +++ lib/mrb/scripts/logger.rb 2014-12-30 15:40:23 +0900 (3302135) @@ -3,7 +3,11 @@ module Groonga def log_error(error) log_level = Level::ERROR.to_i - message = "#{error.class}: #{error.message}" + if error.is_a?(Error) + message = error.message + else + message = "#{error.class}: #{error.message}" + end backtrace = error.backtrace first_raw_entry = backtrace.first if first_raw_entry Modified: lib/mrb/scripts/scan_info_builder.rb (+3 -3) =================================================================== --- lib/mrb/scripts/scan_info_builder.rb 2014-12-30 12:34:46 +0900 (af4477e) +++ lib/mrb/scripts/scan_info_builder.rb 2014-12-30 15:40:23 +0900 (b002eaa) @@ -103,7 +103,7 @@ module Groonga status = Status::COL1 data.args << code.value when Status::COL1 - raise "invalid expression: can't use column as a value: <#{code.value.name}>: <#{@expression.grn_inspect}>" + raise ErrorMessage, "invalid expression: can't use column as a value: <#{code.value.name}>: <#{@expression.grn_inspect}>" status = Status::COL2 when Status::COL2 # Do nothing @@ -128,7 +128,7 @@ module Groonga first_data = @data_list.first if (first_data.flags & ScanInfo::Flags::PUSH) == 0 or first_data.logical_op != @operator - raise "invalid expr" + raise ErrorMessage, "invalid expr" else first_data.flags &= ~ScanInfo::Flags::PUSH first_data.logical_op = @operator @@ -257,7 +257,7 @@ module Groonga end if j < 0 - raise GRN_INVALID_ARGUMENT.new("unmatched nesting level") + raise ErrorMessage, "unmatched nesting level" end end end Modified: lib/mrb/scripts/scan_info_data.rb (+2 -2) =================================================================== --- lib/mrb/scripts/scan_info_data.rb 2014-12-30 12:34:46 +0900 (a75b1cf) +++ lib/mrb/scripts/scan_info_data.rb 2014-12-30 15:40:23 +0900 (783f4a1) @@ -57,7 +57,7 @@ module Groonga else message = "The first argument of NEAR/NEAR2 must be Expression, Accessor or Object: #{arg.class}" - raise message + raise ErrorMessage, message end self.query = @args[1] @@ -80,7 +80,7 @@ module Groonga else message = "The first argument of SIMILAR must be Expression, Accessor or Object: #{arg.class}" - raise message + raise ErrorMesesage, message end self.query = @args[1] Modified: lib/mrb/scripts/sources.am (+1 -0) =================================================================== --- lib/mrb/scripts/sources.am 2014-12-30 12:34:46 +0900 (5bd8b76) +++ lib/mrb/scripts/sources.am 2014-12-30 15:40:23 +0900 (4cf0e49) @@ -5,6 +5,7 @@ RUBY_SCRIPT_FILES = \ context/error_level.rb \ context/rc.rb \ database.rb \ + error.rb \ eval_context.rb \ expression.rb \ index_info.rb \ Modified: test/command/suite/select/filter/invalid/match/argument/column.expected (+1 -1) =================================================================== --- test/command/suite/select/filter/invalid/match/argument/column.expected 2014-12-30 12:34:46 +0900 (8d6a419) +++ test/command/suite/select/filter/invalid/match/argument/column.expected 2014-12-30 15:40:23 +0900 (5be7b98) @@ -27,7 +27,7 @@ select Sites --filter "_key @ uri" ] ] -#|e| RuntimeError: invalid expression: can't use column as a value: <Sites.uri>: <#<expr +#|e| invalid expression: can't use column as a value: <Sites.uri>: <#<expr vars:{ $1:#<record:hash:Sites id:(no value)> }, -------------- next part -------------- HTML����������������������������...Download