Commit 3b127731daa9c0ddf6fe64d70738c772c7ed4d7b
1 parent
b5b6f116
Exists in
master
and in
1 other branch
trying to fix websocket error
Showing
3 changed files
with
4 additions
and
5 deletions
Show diff stats
Gemfile.lock
| @@ -384,8 +384,8 @@ GEM | @@ -384,8 +384,8 @@ GEM | ||
| 384 | libv8 (~> 3.16.14.0) | 384 | libv8 (~> 3.16.14.0) |
| 385 | ref | 385 | ref |
| 386 | thin (1.6.2) | 386 | thin (1.6.2) |
| 387 | - eventmachine (>= 1.0.0) | ||
| 388 | daemons (>= 1.0.9) | 387 | daemons (>= 1.0.9) |
| 388 | + eventmachine (>= 1.0.0) | ||
| 389 | rack (>= 1.0.0) | 389 | rack (>= 1.0.0) |
| 390 | thor (0.19.1) | 390 | thor (0.19.1) |
| 391 | thread_safe (0.3.4) | 391 | thread_safe (0.3.4) |
app/assets/javascripts/v_libras/videos/index.js.erb
| 1 | $(function() { | 1 | $(function() { |
| 2 | $("a.badge").tooltip(); | 2 | $("a.badge").tooltip(); |
| 3 | 3 | ||
| 4 | - var dispatcher = new WebSocketRails('150.165.204.80:443/websocket'); | 4 | + var dispatcher = new WebSocketRails('150.165.204.80:3000/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
| @@ -16,8 +16,7 @@ WebsocketRails.setup do |config| | @@ -16,8 +16,7 @@ WebsocketRails.setup do |config| | ||
| 16 | # Change to true to enable standalone server mode | 16 | # Change to true to enable standalone server mode |
| 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 | ||
| 20 | - config.standalone_port = 443 | 19 | + config.standalone = false |
| 21 | 20 | ||
| 22 | # Change to true to enable channel synchronization between | 21 | # Change to true to enable channel synchronization between |
| 23 | # multiple server instances. | 22 | # multiple server instances. |
| @@ -30,7 +29,7 @@ WebsocketRails.setup do |config| | @@ -30,7 +29,7 @@ WebsocketRails.setup do |config| | ||
| 30 | # Uncomment and edit to point to a different redis instance. | 29 | # Uncomment and edit to point to a different redis instance. |
| 31 | # Will not be used unless standalone or synchronization mode | 30 | # Will not be used unless standalone or synchronization mode |
| 32 | # is enabled. | 31 | # is enabled. |
| 33 | - config.redis_options = {:host => 'localhost', :port => '6379'} | 32 | + # config.redis_options = {:host => 'localhost', :port => '6379'} |
| 34 | 33 | ||
| 35 | # By default, all subscribers in to a channel will be removed | 34 | # By default, all subscribers in to a channel will be removed |
| 36 | # when that channel is made private. If you don't wish active | 35 | # when that channel is made private. If you don't wish active |