Download as
Browse Code »

Commit b5b6f1165f3c2536244480334d77c504bdc83eaf

Authored by renansoares
1 parent d74ca6a5
Exists in master and in 1 other branch v2

trying to fix websocket error

Showing 3 changed files with 7 additions and 2 deletions   Show diff stats
@@ -137,9 +137,12 @@ GEM @@ -137,9 +137,12 @@ GEM
137 dotenv-rails (0.7.0) 137 dotenv-rails (0.7.0)
138 dotenv (= 0.7.0) 138 dotenv (= 0.7.0)
139 em-synchrony (1.0.3) 139 em-synchrony (1.0.3)
  140 + eventmachine (>= 1.0.0.beta.1)
140 em-websocket (0.5.1) 141 em-websocket (0.5.1)
  142 + eventmachine (>= 0.12.9)
141 http_parser.rb (~> 0.6.0) 143 http_parser.rb (~> 0.6.0)
142 erubis (2.7.0) 144 erubis (2.7.0)
  145 + eventmachine (1.2.0.1)
143 execjs (2.0.2) 146 execjs (2.0.2)
144 factory_girl (4.4.0) 147 factory_girl (4.4.0)
145 activesupport (>= 3.0.0) 148 activesupport (>= 3.0.0)
@@ -149,6 +152,7 @@ GEM @@ -149,6 +152,7 @@ GEM
149 faker (1.3.0) 152 faker (1.3.0)
150 i18n (~> 0.5) 153 i18n (~> 0.5)
151 faye-websocket (0.10.0) 154 faye-websocket (0.10.0)
  155 + eventmachine (>= 0.12.0)
152 websocket-driver (>= 0.5.1) 156 websocket-driver (>= 0.5.1)
153 ffi (1.9.3) 157 ffi (1.9.3)
154 foreman (0.66.0) 158 foreman (0.66.0)
@@ -380,6 +384,7 @@ GEM @@ -380,6 +384,7 @@ GEM
380 libv8 (~> 3.16.14.0) 384 libv8 (~> 3.16.14.0)
381 ref 385 ref
382 thin (1.6.2) 386 thin (1.6.2)
  387 + eventmachine (>= 1.0.0)
383 daemons (>= 1.0.9) 388 daemons (>= 1.0.9)
384 rack (>= 1.0.0) 389 rack (>= 1.0.0)
385 thor (0.19.1) 390 thor (0.19.1)
app/assets/javascripts/v_libras/videos/index.js.erb
  Diff comments   View file @b5b6f11
1 $(function() { 1 $(function() {
2 $("a.badge").tooltip(); 2 $("a.badge").tooltip();
3 3
4 - var dispatcher = new WebSocketRails('150.165.204.80:80/websocket'); 4 + var dispatcher = new WebSocketRails('150.165.204.80:443/websocket');
5 5
6 // subscribe to the channel 6 // subscribe to the channel
7 var channel = dispatcher.subscribe('requests_update'); 7 var channel = dispatcher.subscribe('requests_update');
config/initializers/websocket_rails.rb
  Diff comments   View file @b5b6f11
@@ -17,7 +17,7 @@ WebsocketRails.setup do |config| @@ -17,7 +17,7 @@ WebsocketRails.setup do |config|
17 # Start the standalone server with rake websocket_rails:start_server 17 # Start the standalone server with rake websocket_rails:start_server
18 # * Requires Redis 18 # * Requires Redis
19 config.standalone = true 19 config.standalone = true
20 - config.standalone_port = 80 20 + config.standalone_port = 443
21 21
22 # Change to true to enable channel synchronization between 22 # Change to true to enable channel synchronization between
23 # multiple server instances. 23 # multiple server instances.