From 6b96bdcd05dfb47b5be1d71f459f7d4672abf592 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Wed, 17 Sep 2014 10:09:53 -0500
Subject: [PATCH] * VRFS-2221 - fix bad reconnect path

---
 ruby/lib/jam_ruby/connection_manager.rb        | 6 +++++-
 websocket-gateway/lib/jam_websockets/router.rb | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruby/lib/jam_ruby/connection_manager.rb b/ruby/lib/jam_ruby/connection_manager.rb
index bca7d364e..b9e23adf9 100644
--- a/ruby/lib/jam_ruby/connection_manager.rb
+++ b/ruby/lib/jam_ruby/connection_manager.rb
@@ -84,8 +84,12 @@ module JamRuby
         conn.save!(validate: false)
       end
 
+      # if udp_reachable is nil, it means it's unknown.  Since this is a reconnect, we'll, preserve existing value in this case
+      # otherwise, pass in the value of boolean udp_reachable var
+      udp_reachable_value = udp_reachable.nil? ? 'udp_reachable' : udp_reachable
+
       sql =<<SQL
-UPDATE connections SET (channel_id, aasm_state, updated_at, music_session_id, joined_session_at, stale_time, expire_time, udp_reachable) = ('#{channel_id}', '#{Connection::CONNECT_STATE.to_s}', NOW(), #{music_session_id_expression}, #{joined_session_at_expression}, #{connection_stale_time}, #{connection_expire_time}, #{udp_reachable})
+UPDATE connections SET (channel_id, aasm_state, updated_at, music_session_id, joined_session_at, stale_time, expire_time, udp_reachable) = ('#{channel_id}', '#{Connection::CONNECT_STATE.to_s}', NOW(), #{music_session_id_expression}, #{joined_session_at_expression}, #{connection_stale_time}, #{connection_expire_time}, #{udp_reachable_value})
 WHERE 
   client_id = '#{conn.client_id}'
 RETURNING music_session_id
diff --git a/websocket-gateway/lib/jam_websockets/router.rb b/websocket-gateway/lib/jam_websockets/router.rb
index d3b91c552..cdcbf4bf0 100644
--- a/websocket-gateway/lib/jam_websockets/router.rb
+++ b/websocket-gateway/lib/jam_websockets/router.rb
@@ -737,7 +737,7 @@ module JamWebsockets
           if connection.stale?
             ConnectionManager.active_record_transaction do |connection_manager|
               heartbeat_interval, connection_stale_time, connection_expire_time = determine_connection_times(context.user, context.client_type)
-              connection_manager.reconnect(connection, connection.music_session_id, nil, connection_stale_time, connection_expire_time, udp_reachable)
+              connection_manager.reconnect(connection, connection.music_session_id, nil, connection_stale_time, connection_expire_time, nil)
             end
           end
         end