mastofe

commit: 6855baa0c5fd5fb80e1ba450af319aaebdd3fe1a
parent: 07b44278650cede72269ba923051e14f70fd16de
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Wed, 13 Dec 2017 20:43:54 +0900

Change streaming API URL when remote development (#5942)

* Change streaming API URL when remote development

* Use STREAMING_API_BASE_URL when dev env

Diffstat:
M
config/initializers/ostatus.rb
9
++++++---

1 file changed, 6 insertions(+), 3 deletions(-)
diff --git 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