From ccb8ac857330e1ad3aee37b340e5c6e242ac1dd6 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 4 Feb 2017 00:34:31 +0100 Subject: Make the streaming API also handle websockets (because trying to get the browser EventSource interface to work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead of ActionCable like before. This means that if you are upgrading, you should set that up beforehand. --- config/initializers/ostatus.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb index faa9940b0..fb0b8b7fe 100644 --- a/config/initializers/ostatus.rb +++ b/config/initializers/ostatus.rb @@ -10,8 +10,10 @@ Rails.application.configure do config.x.use_s3 = ENV['S3_ENABLED'] == 'true' config.action_mailer.default_url_options = { host: host, protocol: https ? 'https://' : 'http://', trailing_slash: false } + config.x.streaming_api_base_url = 'http://localhost:4000' if Rails.env.production? config.action_cable.allowed_request_origins = ["http#{https ? 's' : ''}://#{host}"] + config.x.streaming_api_base_url = ENV.fetch('STREAMING_API_BASE_URL') { "http#{https ? 's' : ''}://#{host}" } end end -- cgit