insque 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f1434665ea4206ce27e4120c4a08830a43f1e33ee50a7e68c986977f76b6fa4
-  data.tar.gz: 220ebc3acda7272151365db0532938362fddaea061511b5cda4281314014457c
+  metadata.gz: 76857319566e6ee5fddc120c0256117566b000acac4b8681f0b852578e992a4c
+  data.tar.gz: 6abc86e42cde5354fed7f28f41b4389c60cf48752dcaa99f64c593da0016aaa2
 SHA512:
-  metadata.gz: 8bbad94b06e41bc20b709a3f70ebe8c8c7171a2dbe2d07cff93f8bd349ee5a95abaa22c1e839177ad79d638e48fd37096f3a9e4a3ec4cf49c9d2481cdd3917d2
-  data.tar.gz: 5b4348daa91b43d70fc609a15741a1c99c0933bcf14d376243f8a00dc20295d9cfb399ee3c1570b61ade85ffd53d1fb7bebfe30be6ec61b5ada01936deab7727
+  metadata.gz: 9d5ed55a7a823c121cab36d5da526011cd822e4ffd84639f122497c3ba6785f27e005d8061074fadcd2f1b7a2c312079dca8ab7e754504b7e7439c8a362d075b
+  data.tar.gz: 1eab0a5bc5241034e579664b45b00cd93c556ca053b19cd2234a90782ea6259c82bd567acb5c097ada1e4eba97f45dc4f8bcc7935a3ad642a72753cf9f1a34ef

data/lib/insque/json_formatter.rb

@@ -1,6 +1,11 @@
 module Insque
   class JsonFormatter < ::Logger::Formatter
-    def call(severity, time, progname, msg, additional_fields = {})
+    def call(severity, time, progname, data)
+      msg, additional_fields = if data.is_a? ::Hash
+                                 [data[:msg], data[:additional_fields]]
+      else
+        [data, {}]
+      end
       message = case msg
                 when ::String
                   { message: msg }

data/lib/insque/json_logger.rb

@@ -2,10 +2,16 @@ module Insque
   class JsonLogger < ::Logger
     attr_accessor :additional_fields
 
+    def initialize(logdev, level: INFO, sync: true, additional_fields: {})
+      super logdev
+      self.level = level
+      logdev.sync = sync if logdev.respond_to?(:sync=)
+      @default_formatter = JsonFormatter.new
+      @additional_fields = additional_fields
+    end
+
     def format_message(severity, datetime, progname, msg)
-      @json_formatter ||= JsonFormatter.new
-      @additional_fields ||= {}
-      (@formatter || @json_formatter).call(severity, datetime, progname, msg, @additional_fields)
+      (@formatter || @default_formatter).call(severity, datetime, progname, msg: msg, additional_fields: additional_fields)
     end
 
     private

data/lib/insque/version.rb

@@ -1,3 +1,3 @@
 module Insque
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/lib/insque.rb

@@ -38,11 +38,7 @@ module Insque
   end
 
   def self.logger
-    unless @logger
-      @logger = JsonLogger.new(STDOUT)
-      @logger.additional_fields = { tag: 'insque' }
-    end
-    @logger
+    @logger ||= JsonLogger.new STDOUT, additional_fields: { tag: 'insque' }
   end
 
   def self.redis_class= klass
@@ -150,8 +146,8 @@ private
         delete.each {|m| r.lrem processing, 0, m }
       end
       if result
-        errors.each {|m| logger.info deleting: m }
-        restart.each {|m| logger.info restarting: m }
+        errors.each {|m| logger.debug deleting: m }
+        restart.each {|m| logger.debug restarting: m }
         logger.info cleaning: 'success', inbox: inbox
       else
         logger.info cleaning: 'failed', inbox: inbox

data/spec/insque_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe 'insque' do
     system "docker stack deploy -c insque.local.yml insque"
     sleep 10
     Thread.abort_on_exception=true
-    Insque.logger.level = :error
+    #Insque.logger.level = :error
     Insque.sender = 'myapp'
     Insque.inbox_ttl = 3
     Insque.redis_config = { host: 'localhost', port: 63790 }
@@ -53,10 +53,12 @@ RSpec.describe 'insque' do
   end
 
   before(:each) do
-    Insque.redis.flushall
-  rescue
-    sleep 10
-    Insque.redis.flushall
+    begin
+      Insque.redis.flushall
+    rescue
+      sleep 10
+      Insque.redis.flushall
+    end
   end
 
   it "can broadcast without listeners" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: insque
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Yuri Gomozov
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Redis-based multi-threaded queue