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.

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

Make remote console worker dependencies optionally loaded #18593

Merged
merged 1 commit into from
Mar 26, 2019
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 2 additions & 0 deletions lib/remote_console/client_adapter/web_mks.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
require 'websocket/driver'

module RemoteConsole
module ClientAdapter
class WebMKS < SSLSocket
2 changes: 2 additions & 0 deletions lib/remote_console/rack_server.rb
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions lib/remote_console/server_adapter/websocket_binary.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
require 'websocket/driver'

module RemoteConsole
module ServerAdapter
class WebsocketBinary