Merge branch 'master' into origin-2883-job-log-viewer

[arvados.git] / services / api / config / initializers / eventbus.rb

diff --git a/services/api/config/initializers/eventbus.rb b/services/api/config/initializers/eventbus.rb
index e04f1fe2f1df184a65b775fa2af6a8ac213de345..4a6141ccf3c23d82c215ee5994090d8b3532e82b 100644 (file)
--- a/services/api/config/initializers/eventbus.rb
+++ b/services/api/config/initializers/eventbus.rb
@@ -1,5 +1,7 @@
 require 'eventbus'
 
+# See application.yml for details about configuring the websocket service.
+
 Server::Application.configure do
   # Enables websockets if ARVADOS_WEBSOCKETS is defined with any value.  If
   # ARVADOS_WEBSOCKETS=ws-only, server will only accept websocket connections
@@ -7,12 +9,8 @@ Server::Application.configure do
   if ENV['ARVADOS_WEBSOCKETS']
     config.middleware.insert_after ArvadosApiToken, RackSocket, {
       :handler => EventBus,
-      :mount => "/websockets",
+      :mount => "/websocket",
       :websocket_only => (ENV['ARVADOS_WEBSOCKETS'] == "ws-only")
     }
   end
-
-  # Define websocket_address configuration option, can be overridden in config files.
-  # See application.yml.example for details.
-  config.websocket_address = nil
 end