From 5426b95a5b1695f52927a6e68e06efc7b9b85302 Mon Sep 17 00:00:00 2001 From: renansoares Date: Wed, 30 Mar 2016 21:05:50 -0300 Subject: [PATCH] trying to fix websocket error --- config/initializers/eventmachine.rb | 1 + config/nginx.conf | 22 ---------------------- 2 files changed, 1 insertion(+), 22 deletions(-) create mode 100644 config/initializers/eventmachine.rb diff --git a/config/initializers/eventmachine.rb b/config/initializers/eventmachine.rb new file mode 100644 index 0000000..ed81839 --- /dev/null +++ b/config/initializers/eventmachine.rb @@ -0,0 +1 @@ +Thread.new { EventMachine.run } unless EventMachine.reactor_running? && EventMachine.reactor_thread.alive? diff --git a/config/nginx.conf b/config/nginx.conf index 5faae14..33fc78b 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -26,28 +26,6 @@ server { proxy_pass http://puma; } - location @websocket { - proxy_pass http://127.0.0.1:110; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - break; - } - - location /websocket { - proxy_pass http://127.0.0.1:110/websocket; - proxy_http_version 1.1; - proxy_set_header X-Real-IP $remote_addr; - add_header Access-Control-Allow-Origin *; - proxy_set_header Upgrade websocket; - proxy_set_header Connection Upgrade; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - } - error_page 500 502 503 504 /500.html; client_max_body_size 10M; keepalive_timeout 10; -- libgit2 0.21.2