From e5dce5cd03671154c697c27961fda6e03a008260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20Hal=C3=A1sz?= <dhalasz@redhat.com>
Date: Tue, 26 Mar 2019 07:31:06 +0100
Subject: [PATCH] Make remote console worker dependencies optionally loaded

---
 Gemfile                                               | 4 ++--
 lib/remote_console/client_adapter/web_mks.rb          | 2 ++
 lib/remote_console/rack_server.rb                     | 2 ++
 lib/remote_console/server_adapter/websocket_binary.rb | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 732e8ce9a09..1442e133fe1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -210,8 +210,8 @@ group :web_server, :manageiq_default do
 end
 
 group :web_socket, :manageiq_default do
-  gem "surro-gate",                     "~>1.0.5"
-  gem "websocket-driver",               "~>0.6.3"
+  gem "surro-gate",                     "~>1.0.5", :require => false
+  gem "websocket-driver",               "~>0.6.3", :require => false
 end
 
 ### Start of gems excluded from the appliances.
diff --git a/lib/remote_console/client_adapter/web_mks.rb b/lib/remote_console/client_adapter/web_mks.rb
index da628200024..0f080852f49 100644
--- a/lib/remote_console/client_adapter/web_mks.rb
+++ b/lib/remote_console/client_adapter/web_mks.rb
@@ -1,3 +1,5 @@
+require 'websocket/driver'
+
 module RemoteConsole
   module ClientAdapter
     class WebMKS < SSLSocket
diff --git a/lib/remote_console/rack_server.rb b/lib/remote_console/rack_server.rb
index 12ed0f789f8..8f6b00cfd81 100644
--- a/lib/remote_console/rack_server.rb
+++ b/lib/remote_console/rack_server.rb
@@ -20,6 +20,8 @@
 # always returns with a socket to read and a socket to write, the `@adapters`
 # hash has been used to access the corresponding wrappers.
 
+require 'surro-gate'
+
 module RemoteConsole
   class RackServer
     attr_accessor :logger
diff --git a/lib/remote_console/server_adapter/websocket_binary.rb b/lib/remote_console/server_adapter/websocket_binary.rb
index 8fa24c680c6..55775d592c1 100644
--- a/lib/remote_console/server_adapter/websocket_binary.rb
+++ b/lib/remote_console/server_adapter/websocket_binary.rb
@@ -1,3 +1,5 @@
+require 'websocket/driver'
+
 module RemoteConsole
   module ServerAdapter
     class WebsocketBinary