Merge pull request ManageIQ#18342 from skateman/websocket-server-exce…

…ption Do not report an error in websocket_log when closing a VNC connection
lpichler · Jan 9, 2019 · a3a2159 · a3a2159
2 parents 1ac113a + 2d1204f
commit a3a2159
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/websocket_server.rb b/lib/websocket_server.rb
@@ -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)