[Groonga-commit] groonga/groonga at dba5b99 [master] mruby: enable backtrace again

Back to archive index

Kouhei Sutou null+****@clear*****
Wed Dec 30 11:38:29 JST 2015


Kouhei Sutou	2015-12-30 11:38:29 +0900 (Wed, 30 Dec 2015)

  New Revision: dba5b99935198da82eaa33ffdd4c22b70432f414
  https://github.com/groonga/groonga/commit/dba5b99935198da82eaa33ffdd4c22b70432f414

  Message:
    mruby: enable backtrace again

  Modified files:
    lib/mrb/scripts/context.rb
    lib/mrb/scripts/logger.rb

  Modified: lib/mrb/scripts/context.rb (+2 -4)
===================================================================
--- lib/mrb/scripts/context.rb    2015-12-30 11:36:43 +0900 (a66a414)
+++ lib/mrb/scripts/context.rb    2015-12-30 11:38:29 +0900 (3d1282d)
@@ -28,14 +28,12 @@ module Groonga
       set_error_raw(groonga_error.class.rc,
                     ErrorLevel::ERROR,
                     groonga_error.message,
-                    # TODO: Re-enable backtrace after mruby/mruby#2917 has been merged
-                    nil) # groonga_error.backtrace)
+                    groonga_error.backtrace)
     end
 
     def record_error(rc, error)
       rc = RC.find(rc) if rc.is_a?(Symbol)
-      # TODO: Re-enable backtrace after mruby/mruby#2917 has been merged
-      set_error_raw(rc, ErrorLevel::ERROR, error.message, nil) # error.backtrace)
+      set_error_raw(rc, ErrorLevel::ERROR, error.message, error.backtrace)
 
       logger.log_error(error)
     end

  Modified: lib/mrb/scripts/logger.rb (+1 -3)
===================================================================
--- lib/mrb/scripts/logger.rb    2015-12-30 11:36:43 +0900 (28f0a82)
+++ lib/mrb/scripts/logger.rb    2015-12-30 11:38:29 +0900 (cb747a4)
@@ -8,9 +8,7 @@ module Groonga
       else
         message = "#{error.class}: #{error.message}"
       end
-      # TODO: Re-enable backtrace after mruby/mruby#2917 has been merged
-      # backtrace = error.backtrace
-      backtrace = []
+      backtrace = error.backtrace
       last_raw_entry = backtrace.last
       if last_raw_entry
         last_entry = BacktraceEntry.parse(last_raw_entry)
-------------- next part --------------
HTML����������������������������...
下載 



More information about the Groonga-commit mailing list
Back to archive index