Commit 926d20740fd1a3d7901cdca33aa04d8b9e2043cb
1 parent
6293cb38
Exists in
master
and in
1 other branch
trying to fix websocket and callback error
Showing
3 changed files
with
10 additions
and
5 deletions
Show diff stats
Gemfile
Gemfile.lock
| ... | ... | @@ -142,7 +142,7 @@ GEM |
| 142 | 142 | eventmachine (>= 0.12.9) |
| 143 | 143 | http_parser.rb (~> 0.6.0) |
| 144 | 144 | erubis (2.7.0) |
| 145 | - eventmachine (1.0.3) | |
| 145 | + eventmachine (1.2.0.1) | |
| 146 | 146 | execjs (2.0.2) |
| 147 | 147 | factory_girl (4.4.0) |
| 148 | 148 | activesupport (>= 3.0.0) |
| ... | ... | @@ -151,9 +151,9 @@ GEM |
| 151 | 151 | railties (>= 3.0.0) |
| 152 | 152 | faker (1.3.0) |
| 153 | 153 | i18n (~> 0.5) |
| 154 | - faye-websocket (0.7.3) | |
| 154 | + faye-websocket (0.10.0) | |
| 155 | 155 | eventmachine (>= 0.12.0) |
| 156 | - websocket-driver (>= 0.3.1) | |
| 156 | + websocket-driver (>= 0.5.1) | |
| 157 | 157 | ffi (1.9.3) |
| 158 | 158 | foreman (0.66.0) |
| 159 | 159 | dotenv (~> 0.7.0) |
| ... | ... | @@ -407,7 +407,9 @@ GEM |
| 407 | 407 | warden (1.2.3) |
| 408 | 408 | rack (>= 1.0) |
| 409 | 409 | websocket (1.0.7) |
| 410 | - websocket-driver (0.3.3) | |
| 410 | + websocket-driver (0.6.3) | |
| 411 | + websocket-extensions (>= 0.1.0) | |
| 412 | + websocket-extensions (0.1.2) | |
| 411 | 413 | websocket-rails (0.7.0) |
| 412 | 414 | em-synchrony |
| 413 | 415 | faye-websocket |
| ... | ... | @@ -445,6 +447,7 @@ DEPENDENCIES |
| 445 | 447 | dotenv-rails |
| 446 | 448 | factory_girl_rails |
| 447 | 449 | faker |
| 450 | + faye-websocket (= 0.10.0) | |
| 448 | 451 | foreman |
| 449 | 452 | guard-bundler |
| 450 | 453 | guard-livereload | ... | ... |
lib/api_client/client.rb
| ... | ... | @@ -34,7 +34,7 @@ module ApiClient::Client |
| 34 | 34 | def self.process_params(request, files) |
| 35 | 35 | options = { query: request.params.clone } |
| 36 | 36 | options[:query].merge!(:servico => request.service_type) |
| 37 | - options[:query].merge!(:callback => "http://#{ENV['DOMAIN_NAME']}/v_libras/requests/callback?request_id=#{request.id}") | |
| 37 | + options[:query].merge!(:callback => "http://150.165.204.80/v_libras/requests/callback?request_id=#{request.id}") | |
| 38 | 38 | |
| 39 | 39 | options[:query].merge!(:video => files[:video].file.to_file) |
| 40 | 40 | ... | ... |