From 22104e3a977933ecd390a65965d08f78394d8f57 Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Wed, 19 Mar 2014 16:38:59 +0000 Subject: [PATCH] VRFS-1483 undoing accidently checkin of wsg connect params --- web/config/application.rb | 4 ++-- web/config/environments/development.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/config/application.rb b/web/config/application.rb index ff213c11a..5f1e18959 100644 --- a/web/config/application.rb +++ b/web/config/application.rb @@ -107,8 +107,8 @@ if defined?(Bundler) config.websocket_gateway_connect_time_stale = 2 config.websocket_gateway_connect_time_expire = 5 else - config.websocket_gateway_connect_time_stale = 60000 # 12 matches production - config.websocket_gateway_connect_time_expire = 100000 # 20 matches production + config.websocket_gateway_connect_time_stale = 12 # 12 matches production + config.websocket_gateway_connect_time_expire = 20 # 20 matches production end config.websocket_gateway_internal_debug = false config.websocket_gateway_port = 6767 + ENV['JAM_INSTANCE'].to_i diff --git a/web/config/environments/development.rb b/web/config/environments/development.rb index 91835c64b..017f717a1 100644 --- a/web/config/environments/development.rb +++ b/web/config/environments/development.rb @@ -68,8 +68,8 @@ SampleApp::Application.configure do # it's nice to have even admin accounts (which all the default ones are) generate GA data for testing config.ga_suppress_admin = false - config.websocket_gateway_connect_time_stale = 60000 - config.websocket_gateway_connect_time_expire = 100000 + config.websocket_gateway_connect_time_stale = 12 + config.websocket_gateway_connect_time_expire = 20 config.audiomixer_path = ENV['AUDIOMIXER_PATH'] || audiomixer_workspace_path || "/var/lib/audiomixer/audiomixer/audiomixerapp"