freddy-jruby 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b6494076ba5683b88c6381cd4fe89140d4cb877
-  data.tar.gz: 8dcea8a4f75bba5192ec372998a822f9fbc4ab70
+  metadata.gz: bcd002e379a1f9326e97c95617e8027065403fcc
+  data.tar.gz: 2982e7fae24ee6ba8e763be8426d86806406e2da
 SHA512:
-  metadata.gz: 4d05477dbd8e2aec9e0e4044edef0720dfaad0c96f9c2ece269c32388fb412332c0573ff44fc7926885bcafa4fa0e4c9895f7f17abadc9768b81cda3579de4fd
-  data.tar.gz: e49f5287155ad988a10474366f13e9b371712abedd9f6c3f46082d5ae57a73f2f1b78cfe04b42131e96e2a30b2a67af933be83322642d7325ebde0ffcf40e4a1
+  metadata.gz: d4f642d80cbb81bd9150c1cac643d4a919b18ada01cc40ad42e3c26cbc394d1f3491ac11a529243da39aeec7c1e4cc5c3d66699178ed4dc29cf6fdf4b36788be
+  data.tar.gz: d02a32438c611aea42a2d242b7d59d1abfa73fb42a7ac1f17ebb3542059eccffb341b6bc078a822900f9112ee30d6e9615a41d52322fdf88478b7e91681bf113

data/freddy.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   else
     spec.name          = "freddy"
   end
-  spec.version       = '0.5.6'
+  spec.version       = '0.6.0'
   spec.authors       = ["Urmas Talimaa"]
   spec.email         = ["urmas.talimaa@gmail.com"]
   spec.description   = %q{Messaging API}
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
     spec.add_dependency 'march_hare', '~> 2.12.0'
     spec.add_dependency 'symbolizer'
   else
-    spec.add_dependency "bunny", "2.2.0"
+    spec.add_dependency "bunny", "~> 2.5.0"
     spec.add_dependency "oj", "~> 2.13"
   end
 

data/lib/freddy/consumers.rb

@@ -1,11 +1,12 @@
 class Freddy
   module Consumers
     def self.log_receive_event(logger, queue_name, delivery)
-      if defined?(Logasm) && logger.is_a?(Logasm)
-        logger.debug "Received message", queue: queue_name, payload: delivery.payload, correlation_id: delivery.correlation_id
-      else
-        logger.debug "Received message on #{queue_name} with payload #{delivery.payload} with correlation_id #{delivery.correlation_id}"
-      end
+      logger.debug(
+        message: 'Received message',
+        queue: queue_name,
+        payload: delivery.payload,
+        correlation_id: delivery.correlation_id
+      )
     end
   end
 end

data/lib/freddy/producers.rb

@@ -1 +1,9 @@
+class Freddy
+  module Producers
+    def self.log_send_event(logger, payload, destination)
+      logger.debug message: 'Sending message', queue: destination, payload: payload
+    end
+  end
+end
+
 Dir[File.dirname(__FILE__) + '/producers/*.rb'].each(&method(:require))

data/lib/freddy/producers/reply_producer.rb

@@ -9,7 +9,7 @@ class Freddy
       end
 
       def produce(destination, payload, properties)
-        @logger.debug "Sending message #{payload.inspect} to #{destination}"
+        Producers.log_send_event(@logger, payload, destination)
 
         properties = properties.merge(
           routing_key: destination, content_type: CONTENT_TYPE

data/lib/freddy/producers/send_and_forget_producer.rb

@@ -10,7 +10,7 @@ class Freddy
       end
 
       def produce(destination, payload, properties)
-        @logger.debug "Sending message #{payload.inspect} to #{destination}"
+        Producers.log_send_event(@logger, payload, destination)
 
         properties = properties.merge(routing_key: destination, content_type: CONTENT_TYPE)
         json_payload = Payload.dump(payload)

data/lib/freddy/producers/send_and_wait_response_producer.rb

@@ -45,9 +45,13 @@ class Freddy
         )
         json_payload = Payload.dump(payload)
 
-        @logger.debug "Publishing request with payload #{payload.inspect} "\
-                      "to #{destination}, waiting for response on "\
-                      "#{@response_queue.name} with correlation_id #{correlation_id}"
+        @logger.debug(
+          message: 'Publishing request',
+          queue: destination,
+          payload: payload,
+          response_queue: @response_queue.name,
+          correlation_id: correlation_id
+        )
 
         # Connection adapters handle thread safety for #publish themselves. No
         # need to lock these.
@@ -63,10 +67,9 @@ class Freddy
         if request = @request_manager.delete(correlation_id)
           process_response(request, delivery)
         else
-          warning = "Got rpc response for correlation_id #{correlation_id} "\
+          message = "Got rpc response for correlation_id #{correlation_id} "\
                     "but there is no requester"
           @logger.warn message
-          Utils.notify 'NoRequesterForResponse', warning, correlation_id: correlation_id
         end
       end
 
@@ -81,14 +84,6 @@ class Freddy
           @logger.warn "Request timed out waiting response from #{destination}"\
                        ", correlation id #{correlation_id}"
 
-          Utils.notify 'RequestTimeout',
-            "Request timed out waiting for response from #{destination}",
-            {
-              correlation_id: correlation_id,
-              destination: destination,
-              timeout_in_seconds: timeout_in_seconds
-            }
-
           @request_manager.delete(correlation_id)
         end
       end

data/spec/integration/logging_spec.rb

@@ -24,14 +24,21 @@ describe 'Logging' do
   it 'logs all consumed messages' do
     expect(logger1).to have_received(:info).with(/Listening for requests on \S+/)
     expect(logger1).to have_received(:debug).with(
-      /Received message on \S+ with payload {:pay=>"load"}/
+      message: 'Received message',
+      queue: destination,
+      payload: payload,
+      correlation_id: anything
     )
   end
 
   it 'logs all produced messages' do
     expect(logger2).to have_received(:debug).with(/Consuming messages on \S+/)
     expect(logger2).to have_received(:debug).with(
-      /Publishing request with payload {:pay=>"load"} to \S+, waiting for response on amq.gen-\S+ with correlation_id .*/
+      message: 'Publishing request',
+      queue: destination,
+      payload: payload,
+      response_queue: anything,
+      correlation_id: anything
     )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy-jruby
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Urmas Talimaa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -134,15 +134,12 @@ files:
 - lib/freddy/responder_handler.rb
 - lib/freddy/sync_response_container.rb
 - lib/freddy/timeout_error.rb
-- lib/freddy/utils.rb
 - spec/freddy/consumers/respond_to_consumer_spec.rb
-- spec/freddy/consumers_spec.rb
 - spec/freddy/error_response_spec.rb
 - spec/freddy/freddy_spec.rb
 - spec/freddy/message_handler_spec.rb
 - spec/freddy/responder_handler_spec.rb
 - spec/freddy/sync_response_container_spec.rb
-- spec/freddy/utils_spec.rb
 - spec/integration/concurrency_spec.rb
 - spec/integration/logging_spec.rb
 - spec/integration/reply_spec.rb
@@ -173,13 +170,11 @@ specification_version: 4
 summary: API for inter-application messaging supporting acknowledgements and request-response
 test_files:
 - spec/freddy/consumers/respond_to_consumer_spec.rb
-- spec/freddy/consumers_spec.rb
 - spec/freddy/error_response_spec.rb
 - spec/freddy/freddy_spec.rb
 - spec/freddy/message_handler_spec.rb
 - spec/freddy/responder_handler_spec.rb
 - spec/freddy/sync_response_container_spec.rb
-- spec/freddy/utils_spec.rb
 - spec/integration/concurrency_spec.rb
 - spec/integration/logging_spec.rb
 - spec/integration/reply_spec.rb

data/lib/freddy/utils.rb

@@ -1,30 +0,0 @@
-class Freddy
-  class Utils
-    def self.format_exception(exception)
-      message = exception.message
-      backtrace = exception.backtrace.join("\n")
-
-      "#{message}\n#{backtrace}"
-    end
-
-    def self.notify(name, message, parameters={})
-      return unless defined?(Airbrake)
-
-      Airbrake.notify_or_ignore(
-        error_class: name,
-        error_message: message,
-        cgi_data: ENV.to_hash,
-        parameters: parameters
-      )
-    end
-
-    def self.notify_exception(exception, parameters={})
-      return unless defined?(Airbrake)
-
-      Airbrake.notify_or_ignore(exception,
-        cgi_data: ENV.to_hash,
-        parameters: parameters
-      )
-    end
-  end
-end

data/spec/freddy/consumers_spec.rb

@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe Freddy::Consumers do
-  describe '.log_receive_event' do
-    subject { described_class.log_receive_event(logger, queue_name, delivery) }
-
-    let(:queue_name) { 'salemove' }
-    let(:delivery) do
-      instance_double(Freddy::Delivery,
-        payload: {key: 'value'},
-        correlation_id: 'a1b2'
-      )
-    end
-
-    context 'when configured with logasm logger' do
-      let(:logger) { logasm_class.new }
-      let(:logasm_class) { Class.new }
-
-      before do
-        stub_const('::Logasm', logasm_class)
-      end
-
-      it 'logs the received event' do
-        expect(logger).to receive(:debug).with('Received message',
-          queue: 'salemove', payload: {key: 'value'}, correlation_id: 'a1b2'
-        )
-
-        subject
-      end
-    end
-
-    context 'when configured with regular logger' do
-      let(:logger) { Logger.new('/dev/null') }
-
-      it 'logs the received event' do
-        expect(logger).to receive(:debug)
-          .with('Received message on salemove with payload {:key=>"value"} with correlation_id a1b2')
-
-        subject
-      end
-    end
-  end
-end

data/spec/freddy/utils_spec.rb

@@ -1,83 +0,0 @@
-require 'spec_helper'
-
-describe Freddy::Utils do
-  describe '.format_exception' do
-    subject { described_class.format_exception(exception) }
-
-    let(:exception) { double(backtrace: backtrace, message: message) }
-    let(:message)   { 'format exception test' }
-    let(:backtrace) { ['line1', 'line2', 'line3'] }
-
-    it 'format the exception' do
-      should eq "format exception test\n" \
-        "line1\n" \
-        "line2\n" \
-        'line3'
-    end
-  end
-
-  describe '.notify' do
-    subject { described_class.notify(error_class, error_message, parameters) }
-
-    let(:env_attributes) { double }
-    let(:error_class)    { double }
-    let(:error_message)  { double }
-    let(:parameters)     { double }
-
-    context 'when Airbrake is defined' do
-      let(:airbrake) { double }
-
-      before do
-        allow(ENV).to receive(:to_hash) { env_attributes }
-        stub_const('::Airbrake', airbrake)
-      end
-
-      it 'notifies airbrake' do
-        expect(airbrake).to receive(:notify_or_ignore).with(
-          error_class: error_class,
-          error_message: error_message,
-          cgi_data: env_attributes,
-          parameters: parameters
-        )
-
-        subject
-      end
-    end
-
-    context 'when Airbrake is not defined' do
-      it 'does nothing' do
-        should eq(nil)
-      end
-    end
-  end
-
-  describe '.notify_exception' do
-    subject { described_class.notify_exception(exception, {a: 'b'}) }
-
-    let(:exception) { double }
-
-    context 'when Airbrake is defined' do
-      let(:airbrake) { double }
-
-      before do
-        stub_const('::Airbrake', airbrake)
-      end
-
-      it 'notifies airbrake' do
-        expect(airbrake).to receive(:notify_or_ignore) do |ex, content|
-          expect(ex).to eq(exception)
-          expect(content[:cgi_data]).to be_instance_of(Hash)
-          expect(content[:parameters]).to eq(a: 'b')
-        end
-
-        subject
-      end
-    end
-
-    context 'when Airbrake is not defined' do
-      it 'does nothing' do
-        should eq(nil)
-      end
-    end
-  end
-end