diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb index 88ec06026..26e2e2d1e 100644 --- a/app/controllers/status_messages_controller.rb +++ b/app/controllers/status_messages_controller.rb @@ -26,10 +26,10 @@ class StatusMessagesController < ApplicationController raise 'MongoMapper failed to catch a failed save' unless @status_message.id @status_message.photos += photos unless photos.nil? - current_user.dispatch_post(@status_message, :to => params[:status_message][:aspect_ids]) + EM::next_tick {current_user.dispatch_post(@status_message, :to => params[:status_message][:aspect_ids])} for photo in photos - current_user.dispatch_post(photo, :to => params[:status_message][:aspect_ids]) + EM::next_tick { current_user.dispatch_post(photo, :to => params[:status_message][:aspect_ids])} end respond_to do |format| diff --git a/lib/diaspora/user/receiving.rb b/lib/diaspora/user/receiving.rb index 287cee69e..d6b86ef1b 100644 --- a/lib/diaspora/user/receiving.rb +++ b/lib/diaspora/user/receiving.rb @@ -102,7 +102,7 @@ module Diaspora def receive_comment comment unless comment.post.person == self.person || comment.verify_post_creator_signature - Rails.logger.info("event=receive status=abort reason='comment signature not valid' recipient=#{self.diaspora_handle} sender=#{salmon_author.diaspora_handle} payload_type=#{comment.class} post_id=#{comment.post_id}") + Rails.logger.info("event=receive status=abort reason='comment signature not valid' recipient=#{self.diaspora_handle} sender=#{comment.post.person.diaspora_handle} payload_type=#{comment.class} post_id=#{comment.post_id}") return end self.visible_people = self.visible_people | [comment.person] @@ -139,7 +139,7 @@ module Diaspora end elsif on_pod == post update_user_refs_and_add_to_aspects(on_pod) - Rails.logger.info("event=receive payload_type=#{post.class} update=true status=complete sender=#{post.diaspora_handle} existing_post=#{known_post.id}") + Rails.logger.info("event=receive payload_type=#{post.class} update=true status=complete sender=#{post.diaspora_handle} existing_post=#{on_pod.id}") post end elsif !on_pod diff --git a/lib/em-webfinger.rb b/lib/em-webfinger.rb index 6db2cbce2..8c48478e5 100644 --- a/lib/em-webfinger.rb +++ b/lib/em-webfinger.rb @@ -98,6 +98,7 @@ class EMWebfinger c.call(person) rescue Exception => e Rails.logger.info("event=EMWebfinger status=error_on_callback error='#{e.inspect}'") + raise e end } Rails.logger.info("event=EMWebfinger status=complete target=#{@account}")