zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-17 01:47:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

MERGE: merged staging at 3235647, resolved merge conflict

Browse source
This commit is contained in:
Matt Farnsworth 2015-10-30 16:12:20 +02:00
commit 45588dc72a
78 changed files with 308808 additions and 421 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/epp/sessions_controller.rb
View file

@ -116,7 +116,7 @@ class Epp::SessionsController < EppController
def connection_limit_ok?
return true if Rails.env.test? || Rails.env.development?
c = EppSession.where(
'registrar_id = ? AND updated_at >= ?', @api_user.registrar_id, Time.zone.now - 5.minutes
'registrar_id = ? AND updated_at >= ?', @api_user.registrar_id, Time.zone.now - 1.second
).count
return false if c >= 4