From 5c48e81f6785e30978ef536173a2f3959cba83bd Mon Sep 17 00:00:00 2001 From: Raphael Date: Fri, 17 Sep 2010 09:48:01 -0700 Subject: [PATCH 1/2] Give a little more feedback on the websocket server --- script/websocket_server.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/script/websocket_server.rb b/script/websocket_server.rb index 8c466ca77..7dee8d35c 100644 --- a/script/websocket_server.rb +++ b/script/websocket_server.rb @@ -35,6 +35,7 @@ end ws.onclose { Diaspora::WebSocket.unsubscribe(ws.request['Path'].gsub('/',''), sid) } } end + puts "Websocket server started." process_message } From 99ad001d28bcd5875af4dbfe356641a9f6524b1d Mon Sep 17 00:00:00 2001 From: Raphael Date: Fri, 17 Sep 2010 09:52:31 -0700 Subject: [PATCH 2/2] Fix websocket spec, take out puts in by_webfinger --- app/models/person.rb | 2 +- spec/lib/websocket_spec.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/person.rb b/app/models/person.rb index 48e8b0816..ac4a5dfa7 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -85,7 +85,7 @@ class Person local_person elsif !identifier.include?("localhost") && !opts[:local] begin - puts "begin finger" + Rails.logger.info("Webfingering #{identifier}") f = Redfinger.finger(identifier) rescue SocketError => e raise "Diaspora server for #{identifier} not found" if e.message =~ /Name or service not known/ diff --git a/spec/lib/websocket_spec.rb b/spec/lib/websocket_spec.rb index 233f7be48..762a725b5 100644 --- a/spec/lib/websocket_spec.rb +++ b/spec/lib/websocket_spec.rb @@ -17,8 +17,9 @@ describe Diaspora::WebSocket do end it 'The queued job should reach Magent' do - Magent.should_receive(:push) @post.socket_to_uid(@user.id, :aspect_ids => @aspect.id) + channel = Magent::GenericChannel.new('websocket') + channel.message_count.should == 1 end end