Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not report an error in websocket_log when closing a VNC connection #18342

Merged
merged 1 commit into from
Jan 9, 2019
Merged

Do not report an error in websocket_log when closing a VNC connection #18342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/websocket_server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def initialize(options = {})
@proxy.each_ready do |left, right|
begin
@adapters[left].fetch(64.kilobytes) { |data| @adapters[right].issue(data) } # left -> right
rescue IOError
rescue IOError, IO::WaitReadable, IO::WaitWritable
cleanup(:info, "Closing websocket proxy for VM %{vm_id}", left, right)
rescue StandardError => ex
cleanup(:error, "Websocket proxy for VM %{vm_id} errored with #{ex} #{ex.backtrace.join("\n")}", left, right)
Expand Down