add logging mixin and replace federation-logger

3 files changed, 7 insertions, 16 deletions

diff --git a/app/workers/base.rb b/app/workers/base.rb
index 2a614663e..d410a103d 100644
--- a/app/workers/base.rb
+++ b/app/workers/base.rb
@@ -8,6 +8,8 @@ module Workers
     sidekiq_options backtrace: (bt = AppConfig.environment.sidekiq.backtrace.get) && bt.to_i,
                     retry:  (rt = AppConfig.environment.sidekiq.retry.get) && rt.to_i
 
+    include Diaspora::Logging
+
     # In the long term we need to eliminate the cause of these
     def suppress_annoying_errors(&block)
       yield
@@ -19,19 +21,13 @@ module Workers
            # Friendica seems to provoke
            Diaspora::NonPublic,
            Diaspora::XMLNotParseable => e
-      Rails.logger.info("error on receive: #{e.class}")
+      logger.warn "error on receive: #{e.class}"
     rescue ActiveRecord::RecordInvalid => e
-      Rails.logger.info("failed to save received object: #{e.record.errors.full_messages}")
+      logger.warn "failed to save received object: #{e.record.errors.full_messages}"
       raise e unless %w(
         "already been taken"
         "is ignored by the post author"
       ).any? {|reason| e.message.include? reason }
     end
-
-    private
-
-    def logger
-      @logger ||= ::Logging::Logger[self]
-    end
   end
 end
diff --git a/app/workers/http_multi.rb b/app/workers/http_multi.rb
index e370cd981..dfc1b9591 100644
--- a/app/workers/http_multi.rb
+++ b/app/workers/http_multi.rb
@@ -31,7 +31,7 @@ module Workers
         if retry_count < MAX_RETRIES
           Workers::HttpMulti.perform_in(1.hour, user_id, encoded_object_xml, hydra.people_to_retry, dispatcher_class_as_string, retry_count + 1)
         else
-          Rails.logger.info("event=http_multi_abandon sender_id=#{user_id} failed_recipient_ids='[#{person_ids.join(', ')}] '")
+          logger.info "event=http_multi_abandon sender_id=#{user_id} failed_recipient_ids='[#{person_ids.join(', ')}]'"
         end
       end
     end
diff --git a/app/workers/receive_unencrypted_salmon.rb b/app/workers/receive_unencrypted_salmon.rb
index 2f7085730..4340443bc 100644
--- a/app/workers/receive_unencrypted_salmon.rb
+++ b/app/workers/receive_unencrypted_salmon.rb
@@ -8,13 +8,8 @@ module Workers
 
     def perform(xml)
       suppress_annoying_errors do
-        begin
-          receiver = Postzord::Receiver::Public.new(xml)
-          receiver.perform!
-        rescue => e
-          FEDERATION_LOGGER.info(e.message)
-          raise e
-        end
+        receiver = Postzord::Receiver::Public.new(xml)
+        receiver.perform!
       end
     end
   end