Merge branch 'master' of github.com:diaspora/diaspora

This commit is contained in:
Raphael 2010-10-05 17:24:18 -07:00
commit 2df3cf353b

View file

@ -34,7 +34,7 @@ class MessageHandler
http = EventMachine::HttpRequest.new(query.destination).get :timeout => TIMEOUT
http.callback {process}
when :hub_publish
http = EventMachine::PubSubHubBub.new(query.destination).get :timeout => TIMEOUT
http = EventMachine::PubSubHubbub.new(query.destination).get :timeout => TIMEOUT
http.callback {process}
else
raise "message is not a type I know!"