brow 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b51fe73e4a857aa33f3546cf5d7f0e434f467c19e585e00e8b7a5535765d0b4
-  data.tar.gz: b36b39d1293d6b32940b5f9306c7a679c6438cc76377ea376560223343c3e6e3
+  metadata.gz: 1e823ebd67a0230133814bbdd5adc0463f2a6e2fe730b54ee2b55ecb925d347f
+  data.tar.gz: 5168d92d78eae8958098cacee8b0c4a25b140a52a6a3b08f7bd1e8e9388056ba
 SHA512:
-  metadata.gz: 7bea156ce56ed4bc49688db5dfd9ce810fcbc6e6a18513445dc734792374b0831063e7ac831c9a1eed4f50459d95cef38181afa3071e5336e1f671a576844938
-  data.tar.gz: ad5cc322c41f678f7de7df6add329defc9c90789fbe2a71df62156d58500a3b65648dacf0bc5bdeb0d986a5d2f542cccceb6e85dd55ef9b679c23a18f81ffc90
+  metadata.gz: aeaa195ffd0be0945d088219d0dd60451d5ef445bee52f35c3f6d379dc2fbbc7ec5784fe0cf0cfd32a771235e87ae607b85173ef264cb4107311026c613befae
+  data.tar.gz: '09f9ae0b7030d6daab14014d31e705d2df68d099ea5fe66a217dcde23fba3b9fededab0f25663651f354174efd2b0e23aa01cbc8faa0e0c6394ab1805ef1567a'

data/CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.1] - 2021-11-05
+
+- Move progname to logg message so it always appears (5ad1596df79f14d06d7b6dc508b1d5a9282aeebb and 531a999067d398daadc4b13d501e7044bcd3b709)
+- Fix echo server in examples (53eea5af37a888666e8740eac196832b3f67dfc7).
+
 ## [0.4.0] - 2021-11-04
 
 ### Added

data/examples/echo_server.rb

@@ -10,8 +10,8 @@ require "socket"
 require "thread"
 require "logger"
 require "json"
-require "rack"
-require "rack/handler/webrick"
+require "singleton"
+require "webrick"
 
 class EchoServer
   include Singleton
@@ -33,11 +33,11 @@ class EchoServer
       ],
     })
 
-    @server.mount '/', Rack::Handler::WEBrick, ->(env) {
-      request = Rack::Request.new(env)
-      @logger.debug JSON.parse(request.body.read).inspect
-      [200, {}, [""]]
-    }
+    @server.mount_proc '/' do |request, response|
+      @logger.debug JSON.parse(request.body).inspect
+      response.header["Content-Type"] = "application/json"
+      response.body = "{}"
+    end
 
     @thread = Thread.new { @server.start }
     Timeout.timeout(10) { :wait until @started }

data/lib/brow/message_batch.rb

@@ -50,7 +50,7 @@ module Brow
       message_json_size = message_json.bytesize
 
       if message_too_big?(message_json_size)
-        @logger.error("[brow]") { 'a message exceeded the maximum allowed size' }
+        @logger.error { "#{LOG_PREFIX} a message exceeded the maximum allowed size" }
       else
         @messages << message
         @json_size += message_json_size + 1 # One byte for the comma

data/lib/brow/transport.rb

@@ -86,16 +86,16 @@ module Brow
     #
     # @return [Response] API response
     def send_batch(batch)
-      logger.debug("[brow]") { "Sending request for #{batch.length} items" }
+      logger.debug { "#{LOG_PREFIX} Sending request for #{batch.length} items" }
 
       last_response, exception = retry_with_backoff(retries) do
         response = send_request(batch)
-        logger.debug("[brow]") { "Response: status=#{response.code}, body=#{response.body}" }
+        logger.debug { "#{LOG_PREFIX} Response: status=#{response.code}, body=#{response.body}" }
         [Response.new(response.code.to_i, nil), retry?(response)]
       end
 
       if exception
-        logger.error("[brow]") { exception.message }
+        logger.error { "#{LOG_PREFIX} #{exception.message}" }
         exception.backtrace.each { |line| logger.error(line) }
         Response.new(-1, exception.to_s)
       else
@@ -108,7 +108,7 @@ module Brow
 
     # Closes a persistent connection if it exists
     def shutdown
-      logger.info("[brow]") { "Transport shutting down" }
+      logger.info { "#{LOG_PREFIX} Transport shutting down" }
       @http.finish if @http.started?
     end
 
@@ -118,15 +118,15 @@ module Brow
       status_code = response.code.to_i
       if status_code >= 500
         # Server error. Retry and log.
-        logger.info("[brow]") { "Server error: status=#{status_code}, body=#{response.body}" }
+        logger.info { "#{LOG_PREFIX} Server error: status=#{status_code}, body=#{response.body}" }
         true
       elsif status_code == 429
         # Rate limited. Retry and log.
-        logger.info("[brow]") { "Rate limit error: body=#{response.body}" }
+        logger.info { "#{LOG_PREFIX} Rate limit error: body=#{response.body}" }
         true
       elsif status_code >= 400
         # Client error. Do not retry, but log.
-        logger.error("[brow]") { "Client error: status=#{status_code}, body=#{response.body}" }
+        logger.error { "#{LOG_PREFIX} Client error: status=#{status_code}, body=#{response.body}" }
         false
       else
         false
@@ -148,13 +148,13 @@ module Brow
         result, should_retry = yield
         return [result, nil] unless should_retry
       rescue StandardError => error
-        logger.debug("[brow]") {  "Request error: #{error}" }
+        logger.debug { "#{LOG_PREFIX} Request error: #{error}" }
         should_retry = true
         caught_exception = error
       end
 
       if should_retry && (retries_remaining > 1)
-        logger.debug("[brow]") { "Retrying request, #{retries_remaining} retries left" }
+        logger.debug { "#{LOG_PREFIX} Retrying request, #{retries_remaining} retries left" }
         sleep(@backoff_policy.next_interval.to_f / 1000)
         retry_with_backoff(retries_remaining - 1, &block)
       else

data/lib/brow/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Brow
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/brow/worker.rb

@@ -96,7 +96,7 @@ module Brow
         queue << data
         true
       else
-        logger.warn("[brow]") { "Queue is full, dropping events. The :max_queue_size configuration parameter can be increased to prevent this from happening." }
+        logger.warn { "#{LOG_PREFIX} Queue is full, dropping events. The :max_queue_size configuration parameter can be increased to prevent this from happening." }
         false
       end
     end
@@ -112,12 +112,12 @@ module Brow
       if @thread
         begin
           if @thread.join(shutdown_timeout)
-            logger.info("[brow]") { "Worker thread [#{@thread.object_id}] joined sucessfully" }
+            logger.info { "#{LOG_PREFIX} Worker thread [#{@thread.object_id}] joined sucessfully" }
           else
-            logger.info("[brow]") { "Worker thread [#{@thread.object_id}] did not join successfully" }
+            logger.info { "#{LOG_PREFIX} Worker thread [#{@thread.object_id}] did not join successfully" }
           end
         rescue => error
-          logger.info("[brow]") { "Worker thread [#{@thread.object_id}] error shutting down: #{error.inspect}" }
+          logger.info { "#{LOG_PREFIX} Worker thread [#{@thread.object_id}] error shutting down: #{error.inspect}" }
         end
       end
     end
@@ -131,7 +131,7 @@ module Brow
 
         case message
         when SHUTDOWN
-          logger.info("[brow]") { "Worker shutting down" }
+          logger.info { "#{LOG_PREFIX} Worker shutting down" }
           send_batch(batch) unless batch.empty?
           break
         else
@@ -165,7 +165,7 @@ module Brow
       begin
         return if thread_alive?
         @thread = Thread.new { run }
-        logger.debug("[brow]") { "Worker thread [#{@thread.object_id}] started" }
+        logger.debug { "#{LOG_PREFIX} Worker thread [#{@thread.object_id}] started" }
       ensure
         mutex.unlock
       end

data/lib/brow.rb

@@ -6,6 +6,9 @@ require "logger"
 module Brow
   class Error < StandardError; end
 
+  # Private
+  LOG_PREFIX = "[brow]"
+
   # Public: Returns the logger instance to use for logging of things.
   def self.logger
     return @logger if @logger

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brow
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2021-11-06 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: