From 6b9e7ef3ecbabebcc77bc893724bff4c65af5af5 Mon Sep 17 00:00:00 2001 From: Jonne Hass Date: Sat, 5 Nov 2011 15:59:33 +0100 Subject: [PATCH] ugly thing to prevent crashing websocket for dmorley, hopefully --- script/websocket_server.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/script/websocket_server.rb b/script/websocket_server.rb index cef754418..ce13104f3 100644 --- a/script/websocket_server.rb +++ b/script/websocket_server.rb @@ -64,7 +64,9 @@ begin cookies = ws.request["cookie"].split(';') session_key = "_diaspora_session=" - enc_diaspora_cookie = cookies.detect{|c| c.include?(session_key)}.gsub(session_key,'') + enc_diaspora_cookie = cookies.detect{|c| c.include?(session_key)} + raise IndexError, "No session cookie available" unless enc_diaspora_cookie + enc_diaspora_cookie.gsub(session_key,'') cookie = Marshal.load(enc_diaspora_cookie.strip.unpack("m*").first) debug_pp cookie @@ -88,6 +90,9 @@ begin debug_pp "Could not open socket for request with cookie: #{ws.request["cookie"]}" debug_pp "Error was: " debug_pp e + rescue IndexError => e + debug_pp e + debug_pp "Cookie was: #{ws.request["cookie"]}" end } end