From 4599f700e62726247f859c4a04845cc814097a48 Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Thu, 18 Nov 2010 14:51:47 +0100 Subject: [PATCH] Show error cause in websocket_server, trailing blanks. Related to, but does not solve http://bugs.joindiaspora.com/issues/540. --- script/websocket_server.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/script/websocket_server.rb b/script/websocket_server.rb index a89cde3d8..82f3b57a2 100644 --- a/script/websocket_server.rb +++ b/script/websocket_server.rb @@ -47,7 +47,8 @@ def package_js begin Jammit.package! rescue => e - puts "Error minifying assets, but server will continue starting normally. Is Java installed on your system?" + puts "Error minifying assets, but server will continue starting normally." + puts e.inspect end end @@ -67,7 +68,7 @@ begin :cert_chain_file => APP_CONFIG[:socket_cert_chain_location] } end - + EventMachine::WebSocket.start( socket_params ) do |ws| ws.onopen { @@ -91,7 +92,7 @@ begin ws.onclose { begin debug_pp "In WSS, unsuscribing user: #{User.find(user_id).real_name} with id: #{user_id}" - Diaspora::WebSocket.unsubscribe(user_id, sid) + Diaspora::WebSocket.unsubscribe(user_id, sid) rescue debug_pp "Could not unsubscribe socket for #{user_id}" end