Skip to content

Commit 4e3d82a

Browse files
authored
Merge pull request #200 from kojix2/kojix2-patch2
Fix execution error messages on the IOPub (PUB/SUB) channel
2 parents e52ef91 + f6a1035 commit 4e3d82a

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

lib/iruby/kernel.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def dispatch
5353
end
5454
rescue Exception => e
5555
IRuby.logger.debug "Kernel error: #{e.message}\n#{e.backtrace.join("\n")}"
56-
@session.send(:publish, :error, error_message(e))
56+
@session.send(:publish, :error, error_content(e))
5757
end
5858

5959
def kernel_info_request(msg)
@@ -92,8 +92,9 @@ def execute_request(msg)
9292
rescue SystemExit
9393
content[:payload] << { source: :ask_exit }
9494
rescue Exception => e
95-
content = error_message(e)
95+
content = error_content(e)
9696
@session.send(:publish, :error, content)
97+
content[:status] = :error
9798
end
9899
@session.send(:reply, :execute_reply, content)
99100
@session.send(:publish, :execute_result,
@@ -102,9 +103,8 @@ def execute_request(msg)
102103
execution_count: @execution_count) unless result.nil? || msg[:content]['silent']
103104
end
104105

105-
def error_message(e)
106-
{ status: :error,
107-
ename: e.class.to_s,
106+
def error_content(e)
107+
{ ename: e.class.to_s,
108108
evalue: e.message,
109109
traceback: ["#{RED}#{e.class}#{RESET}: #{e.message}", *e.backtrace.map { |l| "#{WHITE}#{l}#{RESET}" }] }
110110
end

0 commit comments

Comments
 (0)