diff options
| author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-12-13 20:43:54 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-12-13 12:43:54 +0100 |
| commit | 6855baa0c5fd5fb80e1ba450af319aaebdd3fe1a (patch) | |
| tree | ef13a2eb04f818746083c70152f6cb36f946d821 /config/initializers/ostatus.rb | |
| parent | 07b44278650cede72269ba923051e14f70fd16de (diff) | |
Change streaming API URL when remote development (#5942)
* Change streaming API URL when remote development * Use STREAMING_API_BASE_URL when dev env
Diffstat (limited to 'config/initializers/ostatus.rb')
| -rw-r--r-- | config/initializers/ostatus.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb index ba96fda22..bb8591f74 100644 --- a/config/initializers/ostatus.rb +++ b/config/initializers/ostatus.rb @@ -17,9 +17,12 @@ Rails.application.configure do config.x.alternate_domains = alternate_domains.split(/\s*,\s*/) config.action_mailer.default_url_options = { host: web_host, protocol: https ? 'https://' : 'http://', trailing_slash: false } - 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') { "ws#{https ? 's' : ''}://#{web_host}" } + config.x.streaming_api_base_url = ENV.fetch('STREAMING_API_BASE_URL') do + if Rails.env.production? + "ws#{https ? 's' : ''}://#{web_host}" + else + "ws://#{ENV['REMOTE_DEV'] == 'true' ? host.split(':').first : 'localhost'}:4000" + end end end |