umbra-rb 0.1.2.pre → 0.1.3.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4684500b81274dd2138addcd92553e0da823b5b26a357ddecb277032315a70d
-  data.tar.gz: 5766bac48f8ff39c374dd44b2e93553483b2d8af72419ac1d49665526d336fd5
+  metadata.gz: f02fb8bd32e28add55e66431d5d04b94586e66245c31a75a6e6d391781680d11
+  data.tar.gz: 65b2eeed6b27b8e72966102e534e7d29cb46bc639acacff46f63b79e7a112564
 SHA512:
-  metadata.gz: 20cd0d4cb5a5e1f700c6eb0fec91f984519c77e55fa0ed3388a1d3be23ce9c315226ebf651301fb58e5518c07ba907519be40d305aa336a437e3f6184d282120
-  data.tar.gz: e8128423446eab2d6615665b7d5aacaf5bf6c106e0093e2d7a2583d10e19a3ce9ca89596a5e067db0a51cc9060b952b590e6161d668740674f7e5281fccc07ef
+  metadata.gz: 592160621a75b39df6055bce8e7356167df48ab6eedcbf65432f17e1b42622ac2ed7dfeacb36d252d78398789406630c55af3bb741d0152562d8e39e24ff45f2
+  data.tar.gz: 7fc6eec4562a0cd1174cd7b60f4dc820b4dd350ea02ac5866cb2b2341af5fd47704ccfcfba10cd443f2d802211244efb57ffb19a046ec2bbdbf1aa7f4cd4e686

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    umbra-rb (0.1.1.pre)
+    umbra-rb (0.1.3.pre)
       multi_json (~> 1.13)
       oj (~> 3.9)
       redis (~> 4.1)

data/lib/umbra.rb

@@ -27,6 +27,8 @@ module Umbra
 
     def configure(&block)
       @config = Config.default(&block)
+
+      test_redis_connection!
     end
 
     def publish(env, response)
@@ -34,6 +36,8 @@ module Umbra
       return unless @config
       return unless @config.request_selector.call(env, response)
 
+      env.merge!('umbra.request_body' => request_body(env))
+
       @config.publisher.call(env, response)
     rescue StandardError => e
       @config.error_handler.call(e, env, response)
@@ -47,6 +51,10 @@ module Umbra
       @config.encoder
     end
 
+    def logger
+      @config.logger
+    end
+
     def reset!
       @config = nil
       @redis = nil
@@ -54,6 +62,27 @@ module Umbra
 
     private
 
+    def request_body(env)
+      io = env.fetch('rack.input')
+      io.rewind
+      body = io.read
+      io.rewind
+
+      body
+    end
+
+    def test_redis_connection!
+      logger.info '[umbra] Testing redis connection...'
+      redis.ping
+      logger.info '[umbra] redis is alive!'
+    rescue Redis::BaseError => e
+      logger.warn "[umbra] redis while connecting to redis: #{e.message}"
+      reset!
+    rescue StandardError => e
+      logger.warn "[umbra] redis is misconfigured: #{e.message}"
+      reset!
+    end
+
     def umbra_request?(env)
       env[HEADER_KEY] == HEADER_VALUE
     end

data/lib/umbra/config.rb

@@ -1,6 +1,6 @@
 module Umbra
   class Config
-    attr_accessor :publisher, :request_selector, :encoder, :error_handler, :redis_options
+    attr_accessor :publisher, :request_selector, :encoder, :error_handler, :redis_options, :logger
 
     def self.default(&block)
       new(
@@ -9,6 +9,7 @@ module Umbra
         encoder: Encoder,
         error_handler: SuppressErrorHandler,
         redis_options: {},
+        logger: Logger.new(STDOUT),
         &block
       )
     end
@@ -21,6 +22,7 @@ module Umbra
       @encoder = opts.fetch(:encoder)
       @error_handler = opts.fetch(:error_handler)
       @redis_options = opts.fetch(:redis_options)
+      @logger = opts.fetch(:logger)
 
       yield(self) if block_given?
     end

data/lib/umbra/encoder.rb

@@ -40,13 +40,7 @@ module Umbra
     end
 
     def request_body
-      io = @env.fetch('rack.input')
-
-      io.rewind
-      body = io.read
-      io.rewind
-
-      body
+      @env.fetch('umbra.request_body')
     end
 
     def body_string

data/lib/umbra/publisher.rb

@@ -6,7 +6,10 @@ module Umbra
       def call(env, response)
         start_once!
 
-        return if @queue.size > MAX_QUEUE_SIZE
+        if @queue.size > MAX_QUEUE_SIZE
+          Umbra.logger.warn '[umbra] Publish queue at max - dropping items'
+          return
+        end
 
         @queue.push(proc { super(env, response) })
       end
@@ -17,6 +20,8 @@ module Umbra
         LOCK.synchronize do
           return if @started == Process.pid
 
+          Umbra.logger.info '[umbra] Starting publishing thread'
+
           @started = Process.pid
           @queue = Queue.new
 
@@ -27,6 +32,7 @@ module Umbra
               begin
                 x.call
               rescue StandardError => e
+                Umbra.logger.warn '[umbra] Error in publishing thread'
                 Umbra.config.error_handler.call(e)
               end
             end

data/lib/umbra/shadow_requester.rb

@@ -12,7 +12,10 @@ module Umbra
     def call(env)
       start_worker!
 
-      return if @queue.size > @max_queue_size
+      if @queue.size > @max_queue_size
+        Umbra.logger.warn '[umbra] Shadowing queue at max - dropping items'
+        return
+      end
 
       request = RequestBuilder.call(env)
 
@@ -26,15 +29,19 @@ module Umbra
         return if @started
 
         @started = true
+        Umbra.logger.info '[umbra] Starting shadowing threads...'
 
-        workers = (1..@pool).map do |_|
+        workers = (1..@pool).map do |thread_num|
           Thread.new do
+            Umbra.logger.info "[umbra] shadow thread #{thread_num} waiting"
+
             while (request = @queue.pop)
               break if request == @stop
 
               begin
                 request.run
               rescue StandardError => e
+                Umbra.logger.warn "[umbra] error in shadow thread #{thread_num}"
                 Umbra.config.error_handler.call(e)
               end
             end

data/lib/umbra/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Umbra
-  VERSION = '0.1.2.pre'
+  VERSION = '0.1.3.pre'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: umbra-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.2.pre
+  version: 0.1.3.pre
 platform: ruby
 authors:
 - carwow Developers