Commit d74ca6a5039d178f91750895882f1f5557d1084a
1 parent
88957cac
Exists in
master
and in
1 other branch
trying to fix websocket error
Showing
2 changed files
with
1 additions
and
6 deletions
Show diff stats
Gemfile.lock
| @@ -137,12 +137,9 @@ GEM | @@ -137,12 +137,9 @@ 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) | ||
| 141 | em-websocket (0.5.1) | 140 | em-websocket (0.5.1) |
| 142 | - eventmachine (>= 0.12.9) | ||
| 143 | http_parser.rb (~> 0.6.0) | 141 | http_parser.rb (~> 0.6.0) |
| 144 | erubis (2.7.0) | 142 | erubis (2.7.0) |
| 145 | - eventmachine (1.2.0.1) | ||
| 146 | execjs (2.0.2) | 143 | execjs (2.0.2) |
| 147 | factory_girl (4.4.0) | 144 | factory_girl (4.4.0) |
| 148 | activesupport (>= 3.0.0) | 145 | activesupport (>= 3.0.0) |
| @@ -152,7 +149,6 @@ GEM | @@ -152,7 +149,6 @@ GEM | ||
| 152 | faker (1.3.0) | 149 | faker (1.3.0) |
| 153 | i18n (~> 0.5) | 150 | i18n (~> 0.5) |
| 154 | faye-websocket (0.10.0) | 151 | faye-websocket (0.10.0) |
| 155 | - eventmachine (>= 0.12.0) | ||
| 156 | websocket-driver (>= 0.5.1) | 152 | websocket-driver (>= 0.5.1) |
| 157 | ffi (1.9.3) | 153 | ffi (1.9.3) |
| 158 | foreman (0.66.0) | 154 | foreman (0.66.0) |
| @@ -385,7 +381,6 @@ GEM | @@ -385,7 +381,6 @@ GEM | ||
| 385 | ref | 381 | ref |
| 386 | thin (1.6.2) | 382 | thin (1.6.2) |
| 387 | daemons (>= 1.0.9) | 383 | daemons (>= 1.0.9) |
| 388 | - eventmachine (>= 1.0.0) | ||
| 389 | rack (>= 1.0.0) | 384 | rack (>= 1.0.0) |
| 390 | thor (0.19.1) | 385 | thor (0.19.1) |
| 391 | thread_safe (0.3.4) | 386 | thread_safe (0.3.4) |
config/initializers/websocket_rails.rb
| @@ -30,7 +30,7 @@ WebsocketRails.setup do |config| | @@ -30,7 +30,7 @@ WebsocketRails.setup do |config| | ||
| 30 | # Uncomment and edit to point to a different redis instance. | 30 | # Uncomment and edit to point to a different redis instance. |
| 31 | # Will not be used unless standalone or synchronization mode | 31 | # Will not be used unless standalone or synchronization mode |
| 32 | # is enabled. | 32 | # is enabled. |
| 33 | - # config.redis_options = {:host => 'localhost', :port => '6379'} | 33 | + config.redis_options = {:host => 'localhost', :port => '6379'} |
| 34 | 34 | ||
| 35 | # By default, all subscribers in to a channel will be removed | 35 | # By default, all subscribers in to a channel will be removed |
| 36 | # when that channel is made private. If you don't wish active | 36 | # when that channel is made private. If you don't wish active |