alephant-publisher-queue 1.4.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fb76d30bb12bb07081c42eb0eeddccb132f7161
-  data.tar.gz: 9cbc18dd80a2355102c869809dbbdc1ac6f6e0e4
+  metadata.gz: 43275970bcb48206ee6a00c7f7889a00579fc983
+  data.tar.gz: 48081162062dda40382d065ca4b2e11fb15decf6
 SHA512:
-  metadata.gz: 77f1130b17759000092c0c650a8bfe9d6eb6132577d3e4c4c5e071d6e218eb95c9273f785bff1bd3db2988413ee10235a45875adfd8b0a4f318577c2b4ebaad2
-  data.tar.gz: 67d9550e9fce5bb4c11dabc23d5b194fb6a8b6623febf9a8845ee25a7bc8bc3391417bde6c446f9b0c2f2f2998b60c378925f833b6d0a31422bb016c185c7b14
+  metadata.gz: 3cc53d959cc6c21cc85bbd8f9acf6bd5c2eb74cab2915919a37d69ed0563cfbf3df6fea8db032803b7645dcf12d77c67d7090992d6f6518e2b11a2d49739b4f1
+  data.tar.gz: 07050f7c856a0d1db3bca8396b9fc5bcf832c067c80f41f6c7d67f0f5169334d31ddb65ba0295d3f172233cdf5df6f0d10069ccb6c4a525fdd4d6f677c8c5d00

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in alephant-publishing.gemspec
 gemspec

data/Guardfile

@@ -1,6 +1,6 @@
-guard 'rspec' do
+guard "rspec" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/.+\.rb$})
   watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('spec/spec_helper.rb')                        { "spec" }
+  watch("spec/spec_helper.rb")                        { "spec" }
 end

data/Rakefile

@@ -1,9 +1,9 @@
-$:.unshift File.join(File.dirname(__FILE__), 'lib')
+$:.unshift File.join(File.dirname(__FILE__), "lib")
 
-require 'rspec/core/rake_task'
-require 'bundler/gem_tasks'
-require 'alephant/publisher/queue'
+require "rspec/core/rake_task"
+require "bundler/gem_tasks"
+require "alephant/publisher/queue"
 
-require 'rake/rspec'
+require "rake/rspec"
 
 task :default => :spec

data/alephant-publisher-queue.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'alephant/publisher/queue/version'
+require "alephant/publisher/queue/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "alephant-publisher-queue"
@@ -28,13 +28,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-nav"
   spec.add_development_dependency 'rake-rspec'
 
-  spec.add_runtime_dependency 'rake'
-  spec.add_runtime_dependency 'aws-sdk', '~> 1.0'
-  spec.add_runtime_dependency 'crimp'
-  spec.add_runtime_dependency 'alephant-support'
-  spec.add_runtime_dependency 'alephant-sequencer'
-  spec.add_runtime_dependency 'alephant-cache'
-  spec.add_runtime_dependency 'alephant-logger', "1.2.0"
-  spec.add_runtime_dependency 'alephant-lookup'
-  spec.add_runtime_dependency 'alephant-renderer'
+  spec.add_runtime_dependency "rake"
+  spec.add_runtime_dependency "aws-sdk", "~> 1.0"
+  spec.add_runtime_dependency "crimp"
+  spec.add_runtime_dependency "alephant-support"
+  spec.add_runtime_dependency "alephant-sequencer"
+  spec.add_runtime_dependency "alephant-cache"
+  spec.add_runtime_dependency "alephant-logger", "~> 3.0.2"
+  spec.add_runtime_dependency "alephant-lookup"
+  spec.add_runtime_dependency "alephant-renderer"
 end

data/lib/alephant/publisher/env.rb

@@ -1,7 +1,8 @@
-require 'aws-sdk'
-require 'yaml'
+require "aws-sdk"
+require "yaml"
+require "alephant/logger"
 
-config_file = 'config/aws.yaml'
+config_file = "config/aws.yaml"
 
 AWS.eager_autoload!
 

data/lib/alephant/publisher/queue/options.rb

@@ -1,5 +1,5 @@
-require 'aws-sdk'
-require 'alephant/logger'
+require "aws-sdk"
+require "alephant/logger"
 
 module Alephant
   module Publisher
@@ -52,7 +52,13 @@ module Alephant
             instance.merge! opts
           rescue Exception => e
             logger.metric "QueueOptionsInvalidKeySpecified"
-            logger.error "Publisher::Queue::Options#validate: '#{e.message}'"
+            logger.error(
+              "event"     => "QueueOptionsKeyInvalid",
+              "class"     => e.class,
+              "message"   => e.message,
+              "backtrace" => e.backtrace.join.to_s,
+              "method"    => "#{self.class}#validate"
+            )
             puts e.message
           end
         end

data/lib/alephant/publisher/queue/processor.rb

@@ -1,5 +1,5 @@
-require 'alephant/publisher/queue/writer'
-require 'alephant/publisher/queue/processor/base'
+require "alephant/publisher/queue/writer"
+require "alephant/publisher/queue/processor/base"
 
 module Alephant
   module Publisher

data/lib/alephant/publisher/queue/sqs_helper/archiver.rb

@@ -39,8 +39,13 @@ module Alephant
           end
 
           def store(message)
-            logger.info log_message(message)
-            store_item message
+            store_item(message).tap do
+              logger.info(
+                "event"       => "MessageStored",
+                "messageBody" => body_for(message),
+                "method"      => "#{self.class}#store"
+              )
+            end
           end
 
           def store_item(message)
@@ -62,14 +67,8 @@ module Alephant
             ]
           end
 
-          def log_message(m)
-            log_message_parts(m.id).tap do |parts|
-              parts << "(#{encoded_body m.body})" if log_message_body
-            end.join(" ")
-          end
-
-          def encoded_body(message)
-            JSON.generate message.split("\n")
+          def body_for(message)
+             log_message_body ? message.body : "No message body available"
           end
 
           def date_key

data/lib/alephant/publisher/queue/sqs_helper/queue.rb

@@ -1,5 +1,5 @@
-require 'aws-sdk'
-require 'alephant/logger'
+require "aws-sdk"
+require "alephant/logger"
 
 module Alephant
   module Publisher
@@ -19,7 +19,13 @@ module Alephant
             @timeout   = timeout
             @wait_time = wait_time
 
-            logger.debug("Queue#initialize: reading from #{queue.url}")
+            logger.info(
+              "event"    => "QueueConfigured",
+              "queueUrl" => queue.url,
+              "archiver" => archiver,
+              "timeout"  => timeout,
+              "method"   => "#{self.class}#initialize"
+            )
           end
 
           def message
@@ -30,7 +36,11 @@ module Alephant
 
           def process(m)
             logger.metric "MessagesReceived"
-            logger.info("Queue#message: received #{m.id}")
+            logger.info(
+              "event"     => "QueueMessageReceived",
+              "messageId" => m.id,
+              "method"    => "#{self.class}#process"
+            )
             archive m
           end
 
@@ -38,7 +48,13 @@ module Alephant
             archiver.see(m) unless archiver.nil?
           rescue StandardError => e
             logger.metric "ArchiveFailed"
-            logger.warn("Queue#archive: archive failed (#{e.message})");
+            logger.error(
+              "event"     => "MessageArchiveFailed",
+              "class"     => e.class,
+              "message"   => e.message,
+              "backtrace" => e.backtrace.join.to_s,
+              "method"    => "#{self.class}#archive"
+            )
           end
 
           def receive

data/lib/alephant/publisher/queue/version.rb

@@ -1,7 +1,7 @@
 module Alephant
   module Publisher
     module Queue
-      VERSION = "1.4.1"
+      VERSION = "2.0.0"
     end
   end
 end

data/lib/alephant/publisher/queue/writer.rb

@@ -1,11 +1,11 @@
-require 'crimp'
+require "crimp"
 
-require 'alephant/cache'
-require 'alephant/lookup'
-require 'alephant/logger'
-require 'alephant/sequencer'
-require 'alephant/support/parser'
-require 'alephant/renderer'
+require "alephant/cache"
+require "alephant/lookup"
+require "alephant/logger"
+require "alephant/sequencer"
+require "alephant/support/parser"
+require "alephant/renderer"
 
 module Alephant
   module Publisher
@@ -45,16 +45,42 @@ module Alephant
         end
 
         def write(id, view)
-          logger.info "Publisher::Queue::Writer#writes: id '#{id}', view '#{view}'"
           seq_for(id).validate(message) do
             store(id, view, location_for(id), :msg_id => message.id)
+          end.tap do
+            logger.info(
+              "event"     => "MessageWritten",
+              "id"        => id,
+              "view"      => view,
+              "method"    => "#{self.class}#write"
+            )
           end
         end
 
         def store(id, view, location, storage_opts = {})
-          logger.info "Publisher::Queue::Writer#store: location '#{location}', message.id '#{message.id}'"
-          cache.put(location, view.render, view.content_type, storage_opts)
-          lookup.write(id, options, seq_id, location)
+          render = view.render
+          cache.put(location, render, view.content_type, storage_opts).tap do
+            logger.info(
+              "event"          => "MessageStored",
+              "location"       => location,
+              "view"           => view,
+              "render"         => render.force_encoding("utf-8"),
+              "contentType"    => view.content_type,
+              "storageOptions" => storage_opts,
+              "messageId"      => message.id,
+              "method"         => "#{self.class}#store"
+            )
+          end
+          lookup.write(id, options, seq_id, location).tap do
+            logger.info(
+              "event"      => "LookupLocationUpdated",
+              "id"         => id,
+              "options"    => options,
+              "sequenceId" => seq_id,
+              "location"   => location,
+              "method"     => "#{self.class}#write"
+            )
+          end
         end
 
         def location_for(id)
@@ -66,7 +92,7 @@ module Alephant
         end
 
         def batch?
-          !batch.nil?.tap { |b| logger.info "Publisher::Queue::Writer#batch?: #{b}" }
+          !batch.nil?
         end
 
         def seq_for(id)
@@ -74,7 +100,7 @@ module Alephant
             config[:sequencer_table_name],
             seq_key_from(id),
             config[:sequence_id_path],
-            config[:keep_all_messages] == 'true'
+            config[:keep_all_messages] == "true"
           )
         end
 

data/lib/alephant/publisher/queue.rb

@@ -1,12 +1,12 @@
-require_relative 'env'
+require_relative "env"
 
-require 'alephant/publisher/queue/version'
-require 'alephant/publisher/queue/options'
-require 'alephant/publisher/queue/sqs_helper/queue'
-require 'alephant/publisher/queue/sqs_helper/archiver'
-require 'alephant/logger'
-require 'alephant/publisher/queue/processor'
-require 'json'
+require "alephant/publisher/queue/version"
+require "alephant/publisher/queue/options"
+require "alephant/publisher/queue/sqs_helper/queue"
+require "alephant/publisher/queue/sqs_helper/archiver"
+require "alephant/logger"
+require "alephant/publisher/queue/processor"
+require "json"
 
 module Alephant
   module Publisher
@@ -68,8 +68,13 @@ module Alephant
         end
 
         def sqs_queue_options
-          logger.info "Publisher::Queue::Publisher#sqs_queue_options: AWS Account ID '#{opts.queue[:aws_account_id]}'"
-          opts.queue[:aws_account_id].nil? ? {} : { :queue_owner_aws_account_id => opts.queue[:aws_account_id] }
+          (opts.queue[:aws_account_id].nil? ? {} : { :queue_owner_aws_account_id => opts.queue[:aws_account_id] }).tap do |ops|
+            logger.info(
+              "event"   => "SQSQueueOptionsConfigured",
+              "options" => ops,
+              "method"  => "#{self.class}#sqs_queue_options"
+            )
+          end
         end
 
         def aws_queue

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-publisher-queue
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0
 platform: ruby
 authors:
 - BBC News
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -223,17 +223,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 3.0.2
   name: alephant-logger
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: