alephant-broker 3.18.0 → 3.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7359058509b2fff49fd7a29c3425c713c6c0738
-  data.tar.gz: e42c65579c05d327a18a6d5a2991c53d2ed81dd7
+  metadata.gz: f210f7897e17ccce5f81abe391c038f1c8ad1ce0
+  data.tar.gz: 9aeac99c27ba61568542e30c6c1fbf1a39861c97
 SHA512:
-  metadata.gz: 87fe78ddd8702e94d9b4a981a1770fb0a55c0e4a90ea6ed8c9f80e9927249b830c52ae94f0aa38655a2c5237cc94d7a0dc83e01c4b2714551e72f46ebc803c0a
-  data.tar.gz: be68d83eee04548185a8880b569ba4f010b2fca364d4751c0ba8c6922fe65f4ad493fe52abd3e827ff771f72c83c9dea37b6f327a4ab0d7110cd34bff1f96cb1
+  metadata.gz: c9ae2a9cf2146b7fb9eb32fd2c69c12851b74709d7883492f75fbbbb6f0e786765c1aed45e03a021bbd378fc761ab233db5736b46b3768d32fcb4997114c15e4
+  data.tar.gz: 97d0cb77082e460f93627c21da6ffafa24584227e7701129efe9938c74e16ad4a536c5a11b700da09fbf001e73936d72b04bd5fa6e14da92ca669398c62579a4

data/.ruby-version

@@ -1 +1 @@
-2.3
+2.3.0

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 rvm:
-  - "2.3"
+  - "2.3.0"
+  - "2.5.1"
+  - "jruby-1.7.23"
   - "jruby-9.1.17.0"
 notifications:
   email:

data/lib/alephant/broker/cache/cached_object.rb

@@ -11,7 +11,7 @@ module Alephant
         DEFAULT_TTL = 10
 
         def initialize(obj)
-          logger.info(event:   'SettingCachedObject',
+          logger.debug(event:  'SettingCachedObject',
                       content: obj,
                       method:  "#{self.class}#initialize")
 
@@ -19,7 +19,7 @@ module Alephant
         end
 
         def update(obj)
-          logger.info(event:       'UpdatingCachedObject',
+          logger.debug(event:      'UpdatingCachedObject',
                       old_content: @s3_obj,
                       new_content: obj,
                       method:      "#{self.class}#update")
@@ -31,14 +31,14 @@ module Alephant
           time = metadata[:'head_Last-Modified']
           Time.parse(time)
         rescue TypeError, ArgumentError => error
-          logger.info(event: 'ErrorCaught', method: "#{self.class}#updated", error: error)
+          logger.error(event: 'CachedObjectLastModifiedError', method: "#{self.class}#updated", error: error)
           Time.now
         end
 
         def ttl
           Integer(metadata[:ttl] || metadata['ttl'])
         rescue TypeError => error
-          logger.info(event: 'ErrorCaught', method: "#{self.class}#ttl", error: error)
+          logger.error(event: 'NonIntegerTTLError', method: "#{self.class}#ttl", error: error)
           Integer(Broker.config[:revalidate_cache_ttl] || DEFAULT_TTL)
         end
 

data/lib/alephant/broker/cache/client.rb

@@ -11,7 +11,10 @@ module Alephant
 
         def initialize
           if config_endpoint.nil?
-            logger.debug 'Broker::Cache::Client#initialize: No config endpoint, NullClient used'
+            logger.error(
+              method:  'Broker::Cache::Client#initialize',
+              message: 'No config endpoint, NullClient used'
+            )
             logger.metric 'NoConfigEndpoint'
             @client = NullClient.new
           else
@@ -23,22 +26,27 @@ module Alephant
           versioned_key = versioned(key)
           result        = @client.get(versioned_key)
 
-          logger.info("Broker::Cache::Client#get key: #{versioned_key} - #{result ? 'hit' : 'miss'}")
+          logger.debug(
+            method: 'Broker::Cache::Client#get',
+            key:    versioned_key,
+            result: result ? 'hit' : 'miss'
+          )
           logger.metric('GetKeyMiss') unless result
 
           return result if result
 
           set(key, yield) if block_given?
-        rescue StandardError => error
-          logger.info(event: 'ErrorCaught', method: "#{self.class}#get", error: error)
-          yield if block_given?
         end
 
         def set(key, value, custom_ttl = nil)
           versioned_key = versioned(key)
           set_ttl       = custom_ttl || ttl
 
-          logger.info("#{self.class}#set - key: #{versioned_key}, ttl: #{set_ttl}")
+          logger.debug(
+            method: "#{self.class}#set",
+            key:    versioned_key,
+            ttl:    set_ttl
+          )
 
           @client.set(versioned_key, value, set_ttl)
 

data/lib/alephant/broker/component_factory.rb

@@ -19,11 +19,19 @@ module Alephant
           @load_strategy.load(component_meta)
         )
       rescue Alephant::Broker::Errors::ContentNotFound => e
-        logger.warn "Broker.ComponentFactory.create: Exception raised (ContentNotFound) for #{component_meta.component_key}"
+        logger.error(
+          method: 'Broker.ComponentFactory.create',
+          message: 'Exception raised (ContentNotFound)',
+          component_key: component_meta.component_key
+        )
         logger.metric "ContentNotFound"
         ErrorComponent.new(component_meta, 404, e)
       rescue => e
-        logger.warn "Broker.ComponentFactory.create: Exception raised (#{e.message}, #{e.backtrace.join('\n')})"
+        logger.error(
+          method:    'Broker.ComponentFactory.create',
+          message:   e.message,
+          backtrace: e.backtrace.join('\n')
+        )
         logger.metric "ExceptionRaised"
         ErrorComponent.new(component_meta, 500, e)
       end

data/lib/alephant/broker/environment.rb

@@ -60,8 +60,12 @@ module Alephant
 
       def parse(json)
         ::JSON.parse(json)
-      rescue ::JSON::ParserError => e
-        logger.warn "Broker.environment#data: ParserError"
+      rescue ::JSON::ParserError => error
+        logger.error(
+          method:  'Broker.environment#data',
+          message: 'ParserError',
+          error: error
+        )
         logger.metric "JSONParserError"
         nil
       end

data/lib/alephant/broker/load_strategy/http.rb

@@ -21,8 +21,9 @@ module Alephant
 
         def load(component_meta)
           fetch_object(component_meta)
-        rescue
-          logger.metric "CacheMiss"
+        rescue StandardError => error
+          logger.error(method: "#{self.class}#load", error: error)
+          logger.metric 'HTTPCacheMiss'
           cache.set(component_meta.component_key, content(component_meta))
         end
 

data/lib/alephant/broker/load_strategy/revalidate/fetcher.rb

@@ -16,8 +16,8 @@ module Alephant
           def fetch
             Alephant::Broker::Cache::CachedObject.new(s3.get(s3_path))
           rescue Aws::S3::Errors::NoSuchKey, InvalidCacheKey => error
-            logger.info(event: 'ErrorCaught', method: "#{self.class}#fetch", error: error)
-            logger.metric('S3InvalidCacheKey')
+            logger.error(event: 'InvalidCacheKeyErrorCaught', method: "#{self.class}#fetch", error: error)
+            logger.metric 'S3InvalidCacheKey'
             raise Alephant::Broker::Errors::ContentNotFound
           end
 

data/lib/alephant/broker/load_strategy/revalidate/refresher.rb

@@ -16,11 +16,11 @@ module Alephant
           def refresh
             inflight = cache.get(inflight_cache_key)
 
-            logger.info(event: 'Inflight?', cache_val: inflight, method: "#{self.class}#refresh")
+            logger.debug(event: 'Inflight?', cache_val: inflight, method: "#{self.class}#refresh")
 
             return if inflight
 
-            logger.info(event: 'QueueMessage', message: message, method: "#{self.class}#refresh")
+            logger.debug(event: 'QueueMessage', message: message, method: "#{self.class}#refresh")
 
             client.send_message(
               queue_url: queue_url,

data/lib/alephant/broker/load_strategy/revalidate/strategy.rb

@@ -44,7 +44,10 @@ module Alephant
 
           def cached_object(component_meta)
             cache.get(component_meta.component_key) do
-              logger.info(msg: "#{self.class}#cached_object - No cache so loading and adding cache object")
+              logger.debug(
+                method:  "#{self.class}#cached_object",
+                message: 'No cache so loading and adding cache object'
+              )
               Fetcher.new(component_meta).fetch
             end
           end
@@ -74,16 +77,21 @@ module Alephant
           end
 
           def cache_new_content(component_meta, new_content)
-            logger.info(event:  'NewContentFromS3',
-                        key:    component_meta.component_key,
-                        val:    new_content,
-                        method: "#{self.class}#refresh_content")
+            logger.debug(
+              event:  'NewContentFromS3',
+              key:    component_meta.component_key,
+              val:    new_content,
+              method: "#{self.class}#refresh_content"
+            )
 
             cache.set(component_meta.component_key, new_content)
           end
 
-          def refresh_content(component_meta)
-            logger.info(msg: "#{self.class}#refresh_content - Loading new content from thread")
+          def refresh_content(component_meta)            
+            logger.debug(
+              method:  "#{self.class}#refresh_content",
+              message: 'Loading new content from thread',
+            )
 
             Refresher.new(component_meta).refresh
           end

data/lib/alephant/broker/load_strategy/s3/base.rb

@@ -61,7 +61,7 @@ module Alephant
             @cached = false
             s3.get s3_path(component_meta)
           rescue Aws::S3::Errors::NoSuchKey, InvalidCacheKey
-            logger.metric "S3InvalidCacheKey"
+            logger.metric 'S3NoSuchKey'
             raise Alephant::Broker::Errors::ContentNotFound
           end
 

data/lib/alephant/broker/request/asset.rb

@@ -18,7 +18,10 @@ module Alephant
           )
         rescue InvalidAssetId
           logger.metric "InvalidAssetId"
-          logger.error "Broker.Request.Asset.initialize: Exception raised (InvalidAssetId)"
+          logger.error(
+            method: 'Broker.Request.Asset.initialize',
+            message: 'Exception raised (InvalidAssetId)'
+          )
         end
 
         private

data/lib/alephant/broker/request/batch.rb

@@ -16,11 +16,14 @@ module Alephant
                         env.options.fetch("batch_id", nil)
                       end
 
-          logger.info "Request::Batch#initialize: id: #{batch_id}"
+          logger.debug(
+            method: "Request::Batch#initialize",
+            id:     batch_id,
+          )
 
           @component_factory = component_factory
 
-          @components        = env.post? ? components_post(env) : components_get(env)
+          @components = env.post? ? components_post(env) : components_get(env)
         end
 
         private

data/lib/alephant/broker/response/asset.rb

@@ -34,7 +34,10 @@ module Alephant
 
         def log
           logger.metric "BrokerResponse#{status}"
-          logger.info "Broker: Component loaded! #{details} (200)"
+          logger.info(
+            message:  'Asset component loaded',
+            status:   status
+          )
         end
       end
     end

data/lib/alephant/broker/response/batch.rb

@@ -10,9 +10,9 @@ module Alephant
         attr_reader :components, :batch_id
 
         def initialize(components, batch_id, request_env)
-          @components  = components
-          @batch_id    = batch_id
-          @status      = self.class.component_not_modified(batch_response_headers, request_env) ? 304 : 200
+          @components = components
+          @batch_id   = batch_id
+          @status     = self.class.component_not_modified(batch_response_headers, request_env) ? 304 : 200
 
           super(@status, "application/json", request_env)
 
@@ -27,7 +27,10 @@ module Alephant
         private
 
         def json
-          logger.info "Broker: Batch load started (#{batch_id})"
+          logger.debug(
+            message:  'Broker: Batch load started',
+            batch_id: batch_id
+          )
           components.map do |component|
             {
               "component"    => component.id,
@@ -39,7 +42,10 @@ module Alephant
               headers["sequence_id"] = component.headers["X-Sequence"] if component.headers["X-Sequence"]
             end
           end.tap do
-            logger.info "Broker: Batch load done (#{batch_id})"
+            logger.debug(
+              message:  'Broker: Batch load completed',
+              batch_id:  batch_id
+            )
             logger.metric "BrokerBatchLoadCount"
           end
         end

data/lib/alephant/broker/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Broker
-    VERSION = "3.18.0".freeze
+    VERSION = "3.19.0".freeze
   end
 end

data/spec/integration/not_modified_response_spec.rb

@@ -115,7 +115,7 @@ describe Alephant::Broker::Application do
     context "when requesting an unmodified response" do
       let(:path)         { "/components/batch" }
       let(:content_type) { "application/json" }
-      let(:etag)         { '"34774567db979628363e6e865127623f"' }
+      let(:etag)         { '"8d2f79a98b0e0c1fbcca34850f2c7f17"' }
 
       before do
         post(path, batch_json,
@@ -186,7 +186,7 @@ describe Alephant::Broker::Application do
     context "when requesting an unmodified response with GET" do
       let(:path)         { "/components/batch?batch_id=baz&components[ni_council_results_table][component]=ni_council_results_table&components[ni_council_results_table][options][foo]=bar&components[ni_council_results_table_no_options][component]=ni_council_results_table" }
       let(:content_type) { "application/json" }
-      let(:etag)         { '"34774567db979628363e6e865127623f"' }
+      let(:etag)         { '"8d2f79a98b0e0c1fbcca34850f2c7f17"' }
 
       before do
         get(

data/spec/integration/rack_spec.rb

@@ -174,7 +174,7 @@ describe Alephant::Broker::Application do
         end
 
         it "should have ETag cache header" do
-          expect(last_response.headers["ETag"]).to eq('"34774567db979628363e6e865127623f"')
+          expect(last_response.headers["ETag"]).to eq('"8d2f79a98b0e0c1fbcca34850f2c7f17"')
         end
 
         it "should have most recent Last-Modified header" do
@@ -223,7 +223,7 @@ describe Alephant::Broker::Application do
         end
 
         it "should have ETag cache header" do
-          expect(last_response.headers["ETag"]).to eq('"34774567db979628363e6e865127623f"')
+          expect(last_response.headers["ETag"]).to eq('"8d2f79a98b0e0c1fbcca34850f2c7f17"')
         end
 
         it "should have most recent Last-Modified header" do
@@ -269,7 +269,7 @@ describe Alephant::Broker::Application do
         end
 
         it "should have ETag cache header" do
-          expect(last_response.headers["ETag"]).to eq('"34774567db979628363e6e865127623f"')
+          expect(last_response.headers["ETag"]).to eq('"8d2f79a98b0e0c1fbcca34850f2c7f17"')
         end
 
         it "should have most recent Last-Modified header" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-broker
 version: !ruby/object:Gem::Version
-  version: 3.18.0
+  version: 3.19.0
 platform: ruby
 authors:
 - BBC News
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-01 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -432,7 +432,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: Brokers requests for alephant components