fastly_nsq 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e65fbb2ed6c6dd2005a6e1e2b94699b853692b7
-  data.tar.gz: 3e787053513145e1c8937246650304b09cedd203
+  metadata.gz: 3c32c3f9d2cd2f85338848cc0755c270572fda54
+  data.tar.gz: b2fe431edb17100e5f6d3b96be45fedec6e7efc0
 SHA512:
-  metadata.gz: bcb774c629e15be874f951c26e7af46f665c0ebce2d9db98a4805e738e8e30bd5cd9b0b231d3a02da1b56df187797d3618357a1f0749f4280e784b8f1816afa9
-  data.tar.gz: c7fe9b04e3dfa3d40203ee1a960891177535729550ed7bb7f8382e0df7fc25171956b8aaadb961c8cc1cc4aa9f26bfd546e9b79cb238e2b61a9b8d421d8bc995
+  metadata.gz: 9bc72094ed5ae3a4e13857df307e70b4f9c95d3fe9fd62f1e1ec3e957638355aee03c70c0f2d55c5b0cdc2a4ed87727fc461fbd658acea29b8623557f5cfe0e2
+  data.tar.gz: 59122c8ecb1ce723027fcf46f9f9bc0592e7122620a6ef6cd67aa73005d604092cf2bf36ef9e6390d0e44c2b338ef146a9ed741c7784870bd3b3199dfa0e1ff0

data/lib/fastly_nsq.rb

@@ -6,6 +6,7 @@ require 'fc'
 require 'set'
 require 'logger'
 require 'forwardable'
+require 'digest/md5'
 
 module FastlyNsq
   NotConnectedError = Class.new(StandardError)

data/lib/fastly_nsq/listener.rb

@@ -38,7 +38,19 @@ class FastlyNsq::Listener
 
   def call(nsq_message)
     message = FastlyNsq::Message.new(nsq_message)
-    logger.info "[NSQ] Message received on topic [#{topic}]: #{message}"
+
+    logger.info do
+      {
+        channel:  channel,
+        topic:    topic,
+        attempts: nsq_message.attempts,
+        id:       Digest::MD5.hexdigest(nsq_message.body.to_s),
+        metadata: message.meta,
+      }.tap do |l|
+        l[:data] = message.body if logger.level == Logger::DEBUG
+      end
+    end
+
     preprocessor&.call(message)
     result = processor.call(message)
     message.finish if result
@@ -48,6 +60,6 @@ class FastlyNsq::Listener
   def terminate
     return unless connected?
     consumer.terminate
-    logger.info "< Consumer terminated: topic [#{topic}]"
+    logger.info "topic #{topic}, channel #{channel}: consumer terminated"
   end
 end

data/lib/fastly_nsq/manager.rb

@@ -43,10 +43,10 @@ class FastlyNsq::Manager
   end
 
   def add_listener(listener)
-    logger.info { "Listening to topic:'#{listener.topic}' on channel: '#{listener.channel}'" }
+    logger.info { "topic #{listener.topic}, channel #{listener.channel}: listening" }
 
     if topic_listeners[listener.topic]
-      logger.warn { "topic: #{listener.topic} was added more than once" }
+      logger.warn { "topic #{listener.topic}: duplicate listener" }
     end
 
     topic_listeners[listener.topic] = listener

data/lib/fastly_nsq/testing.rb

@@ -62,9 +62,13 @@ module FastlyNsq
 
   class TestMessage
     attr_reader :raw_body
+    attr_reader :attempts
+    attr_reader :id
 
     def initialize(raw_body)
       @raw_body = raw_body
+      @id       = Digest::SHA1.hexdigest(raw_body.to_s + Time.now.to_s)
+      @attempts = 0
     end
 
     def body
@@ -78,7 +82,7 @@ module FastlyNsq
     end
 
     def requeue(*)
-      # sure
+      @attempts += 1
       true
     end
   end

data/lib/fastly_nsq/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastlyNsq
-  VERSION = '1.4.1'
+  VERSION = '1.5.0'
 end

data/spec/listener_spec.rb

@@ -130,7 +130,7 @@ RSpec.describe FastlyNsq::Listener do
   end
 
   describe 'faking', :fake do
-    let!(:message) { { 'foo' => 'bar' } }
+    let!(:message) { JSON.dump('foo' => 'bar') }
 
     before { subject }
 
@@ -169,7 +169,7 @@ RSpec.describe FastlyNsq::Listener do
   end
 
   describe 'inline', :inline do
-    let!(:message) { { 'foo' => 'bar' } }
+    let!(:message) { JSON.dump('foo' => 'bar') }
     let!(:processor) { ->(m) { messages << m.raw_body } }
 
     before { subject }

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ if ENV['DEBUG']
   FastlyNsq.logger = Logger.new(STDOUT)
 else
   Concurrent.use_stdlib_logger(Logger::ERROR)
-  FastlyNsq.logger = Logger.new(STDOUT).tap { |l| l.level = Logger::ERROR }
+  FastlyNsq.logger = Logger.new('/dev/null').tap { |l| l.level = Logger::DEBUG }
 end
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastly_nsq
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Tommy O'Neil
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fastly NSQ Adapter