From 0cdcf328657c4a827be2dca9d8614ccbf55045ed Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Thu, 4 May 2017 22:55:13 +0900 Subject: Use ws protocol in streaming API base URL (#2606) --- config/initializers/ostatus.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/initializers/ostatus.rb') diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb index a905a032c..0c6e88f31 100644 --- a/config/initializers/ostatus.rb +++ b/config/initializers/ostatus.rb @@ -12,9 +12,9 @@ Rails.application.configure do config.x.use_s3 = ENV['S3_ENABLED'] == 'true' config.action_mailer.default_url_options = { host: web_host, protocol: https ? 'https://' : 'http://', trailing_slash: false } - config.x.streaming_api_base_url = 'http://localhost:4000' + config.x.streaming_api_base_url = 'ws://localhost:4000' if Rails.env.production? - config.x.streaming_api_base_url = ENV.fetch('STREAMING_API_BASE_URL') { "http#{https ? 's' : ''}://#{web_host}" } + config.x.streaming_api_base_url = ENV.fetch('STREAMING_API_BASE_URL') { "ws#{https ? 's' : ''}://#{web_host}" } end end -- cgit