projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '13959-timeouts-and-logging'
[arvados.git]
/
services
/
api
/
app
/
middlewares
/
rack_socket.rb
diff --git
a/services/api/app/middlewares/rack_socket.rb
b/services/api/app/middlewares/rack_socket.rb
index 795df4a7fc0e1b1b77c94d3d29d92bff77b99fd7..1b301e27abb0f781da583780f6e071acdf9f798e 100644
(file)
--- a/
services/api/app/middlewares/rack_socket.rb
+++ b/
services/api/app/middlewares/rack_socket.rb
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
require 'rack'
require 'faye/websocket'
require 'eventmachine'
require 'rack'
require 'faye/websocket'
require 'eventmachine'
@@
-44,18
+48,26
@@
class RackSocket
if forked && EM.reactor_running?
EM.stop
end
if forked && EM.reactor_running?
EM.stop
end
- Thread.new {
- EM.run
- }
+ Thread.new do
+ begin
+ EM.run
+ ensure
+ ActiveRecord::Base.connection.close
+ end
+ end
die_gracefully_on_signal
end
else
# faciliates debugging
Thread.abort_on_exception = true
# just spawn a thread and start it up
die_gracefully_on_signal
end
else
# faciliates debugging
Thread.abort_on_exception = true
# just spawn a thread and start it up
- Thread.new {
- EM.run
- }
+ Thread.new do
+ begin
+ EM.run
+ ensure
+ ActiveRecord::Base.connection.close
+ end
+ end
end
# Create actual handler instance object from handler class.
end
# Create actual handler instance object from handler class.
@@
-69,7
+81,11
@@
class RackSocket
def call env
request = Rack::Request.new(env)
if request.path_info == @endpoint and Faye::WebSocket.websocket?(env)
def call env
request = Rack::Request.new(env)
if request.path_info == @endpoint and Faye::WebSocket.websocket?(env)
- ws = Faye::WebSocket.new(env)
+ if @handler.overloaded?
+ return [503, {"Content-Type" => "text/plain"}, ["Too many connections, try again later."]]
+ end
+
+ ws = Faye::WebSocket.new(env, nil, :ping => 30)
# Notify handler about new connection
@handler.on_connect ws
# Notify handler about new connection
@handler.on_connect ws