Skip to content

Commit

Permalink
Merge pull request #18593 from skateman/remote-optional
Browse files Browse the repository at this point in the history
Make remote console worker dependencies optionally loaded
  • Loading branch information
Fryguy authored Mar 26, 2019
2 parents 1922983 + e5dce5c commit 2f11a59
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
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
Expand Down
2 changes: 2 additions & 0 deletions lib/remote_console/rack_server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
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
Expand Down

0 comments on commit 2f11a59

Please sign in to comment.