diff --git a/gpg/diaspora-test/pubring.gpg b/gpg/diaspora-test/pubring.gpg index edac5d95b..cabfdca74 100644 Binary files a/gpg/diaspora-test/pubring.gpg and b/gpg/diaspora-test/pubring.gpg differ diff --git a/gpg/diaspora-test/trustdb.gpg b/gpg/diaspora-test/trustdb.gpg index 87e4dbb8a..0302183a5 100644 Binary files a/gpg/diaspora-test/trustdb.gpg and b/gpg/diaspora-test/trustdb.gpg differ diff --git a/lib/diaspora/webhooks.rb b/lib/diaspora/webhooks.rb index c303fa5a7..c73530d11 100644 --- a/lib/diaspora/webhooks.rb +++ b/lib/diaspora/webhooks.rb @@ -28,12 +28,9 @@ module Diaspora end def push_to(recipients) - puts "FOOBATT" @@queue.add_hub_notification(APP_CONFIG[:pubsub_server], User.owner.url + self.class.to_s.pluralize.underscore + '.atom') unless recipients.empty? recipients.map!{|x| x = x.url + "receive/"} - puts self.class - puts "made it in here!" xml = self.class.build_xml_for(self) Rails.logger.info("Adding xml for #{self} to message queue to #{recipients}") @@queue.add_post_request( recipients, xml ) diff --git a/lib/message_handler.rb b/lib/message_handler.rb index 8d35cb1f3..3e76c2783 100644 --- a/lib/message_handler.rb +++ b/lib/message_handler.rb @@ -46,7 +46,7 @@ class MessageHandler case query.type when :post http = EventMachine::HttpRequest.new(query.destination).post :timeout => TIMEOUT, :body =>{:xml => query.body} - http.callback { puts query.destination; puts query.body; process; process} + http.callback { process; process} when :get http = EventMachine::HttpRequest.new(query.destination).get :timeout => TIMEOUT http.callback {send_to_seed(query, http.response); process}