tobox 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20f2b2ccbeacc67bb55403fa085c7d02bbe38e7f49263a5c006958bb35d987f2
-  data.tar.gz: 0e69f560de1959cf87acc8b245ae02dfdf7b8beff693023a6a2651a29cb9b43d
+  metadata.gz: 13c585e5f8cec257d1f8de481a90620f7e71ce6cd4cac6b4b769cb04ab62c485
+  data.tar.gz: fddcccd9b518c8303131693ed66c178ae6ea833cd7941dab4c588a284e715967
 SHA512:
-  metadata.gz: d3588443eaf61c20ce1eebcf8b3a291ff959bc9861a5ffb157210b9790106e7ed5fe9818362539c5943d1531afbe93d8e9c84f8dd545b8d3a22d9fcede7d0a43
-  data.tar.gz: 1d19aa8d047754f107043fcab8c6ea2835007fb1dfe206bedb2831561f5cf4616e03befe46310ac4463cbd8adf7abe532d736acc7e6790dde792c7a2ccb80972
+  metadata.gz: 1dda1246e5e0651a5f31c4b9ee1a3aae333e0a7098a26e72e839681ccec1466936199abe840d9153d56b5e8fa1532594f7e915ffa5953f0382e5d22b3b07e35d
+  data.tar.gz: 7958822a76f442696c6323af42031cd28091fdfb764eb8b1a39737ab214048d3c664275c4c91abc47c84c070f9940b325a297547ffce8815203bb97711f2280e

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
 
+## [0.1.1] - 2002-09-14
+
+### Chore
+
+Improved default logger, by logging the thread name, as well as providing the worker id in the lifecycle event logs.
+
+### Bugfixes
+
+Do not try to json parse already parsed json columns (this happens if the DB object already has `:pg_json` extension loaded).
+
 ## [0.1.0] - 2022-09-05
 
 - Initial release.

data/lib/tobox/cli.rb

@@ -17,13 +17,13 @@ module Tobox
 
     def run
       options = @options
-      logger = Logger.new($stderr)
 
       config = Configuration.new do |c|
-        c.logger(logger)
         c.instance_eval(File.read(options.fetch(:config_file)), options.fetch(:config_file), 1)
       end
 
+      logger = config.default_logger
+
       # boot
       options.fetch(:require).each(&method(:require))
 

data/lib/tobox/configuration.rb

@@ -25,6 +25,14 @@ module Tobox
       worker: :thread
     }.freeze
 
+    LOG_FORMAT_PATTERN = "%s, [%s #%d (th: %s)] %5s -- %s: %s\n"
+    DEFAULT_LOG_FORMATTER = Class.new(Logger::Formatter) do
+      def call(severity, time, progname, msg)
+        format(LOG_FORMAT_PATTERN, severity[0, 1], format_datetime(time), Process.pid,
+               Thread.current.name || Thread.current.object_id, severity, progname, msg2str(msg))
+      end
+    end.new
+
     def initialize(name = nil, &block)
       @name = name
       @config = DEFAULT_CONFIGURATION.dup
@@ -46,7 +54,7 @@ module Tobox
       end
 
       env = @config[:environment]
-      @default_logger = @config[:logger] || Logger.new(STDERR) # rubocop:disable Style/GlobalStdStream
+      @default_logger = @config[:logger] || Logger.new(STDERR, formatter: DEFAULT_LOG_FORMATTER) # rubocop:disable Style/GlobalStdStream
       @default_logger.level = @config[:log_level] || (env == "production" ? Logger::INFO : Logger::DEBUG)
 
       freeze

data/lib/tobox/fetcher.rb

@@ -4,7 +4,8 @@ require "json"
 
 module Tobox
   class Fetcher
-    def initialize(configuration)
+    def initialize(label, configuration)
+      @label = label
       @configuration = configuration
 
       @logger = @configuration.default_logger
@@ -56,7 +57,7 @@ module Tobox
               num_events = events.size
 
               events.each do |ev|
-                ev[:metadata] = JSON.parse(ev[:metadata].to_s) if ev[:metadata]
+                ev[:metadata] = try_json_parse(ev[:metadata])
                 handle_before_event(ev)
                 yield(to_message(ev))
               rescue StandardError => e
@@ -90,6 +91,10 @@ module Tobox
 
     private
 
+    def log_message(msg)
+      "(worker: #{@label}) -> #{msg}"
+    end
+
     def mark_as_error(event, error)
       @ds.where(id: event[:id]).returning.update(
         attempts: Sequel[@table][:attempts] + 1,
@@ -105,21 +110,31 @@ module Tobox
       {
         id: event[:id],
         type: event[:type],
-        before: (JSON.parse(event[:data_before].to_s) if event[:data_before]),
-        after: (JSON.parse(event[:data_after].to_s) if event[:data_after]),
+        before: try_json_parse(event[:data_before]),
+        after: try_json_parse(event[:data_after]),
         at: event[:created_at]
       }
     end
 
+    def try_json_parse(data)
+      return unless data
+
+      data = JSON.parse(data.to_s) unless data.is_a?(Hash)
+
+      data
+    end
+
     def handle_before_event(event)
-      @logger.debug { "outbox event (type: \"#{event[:type]}\", attempts: #{event[:attempts]}) starting..." }
+      @logger.debug do
+        log_message("outbox event (type: \"#{event[:type]}\", attempts: #{event[:attempts]}) starting...")
+      end
       @before_event_handlers.each do |hd|
         hd.call(event)
       end
     end
 
     def handle_after_event(event)
-      @logger.debug { "outbox event (type: \"#{event[:type]}\", attempts: #{event[:attempts]}) completed" }
+      @logger.debug { log_message("outbox event (type: \"#{event[:type]}\", attempts: #{event[:attempts]}) completed") }
       @after_event_handlers.each do |hd|
         hd.call(event)
       end
@@ -127,9 +142,9 @@ module Tobox
 
     def handle_error_event(event, error)
       @logger.error do
-        "outbox event (type: \"#{event[:type]}\", attempts: #{event[:attempts]}) failed with error\n" \
-          "#{error.class}: #{error.message}\n" \
-          "#{error.backtrace.join("\n")}"
+        log_message("outbox event (type: \"#{event[:type]}\", attempts: #{event[:attempts]}) failed with error\n" \
+                    "#{error.class}: #{error.message}\n" \
+                    "#{error.backtrace.join("\n")}")
       end
       @error_event_handlers.each do |hd|
         hd.call(event, error)

data/lib/tobox/plugins/datadog/configuration.rb

@@ -9,17 +9,17 @@ module Datadog
         module Configuration
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool("DD_TRACE_SIDEKIQ_ENABLED", true) }
+              o.default { env_to_bool("DD_TOBOX_SIDEKIQ_ENABLED", true) }
               o.lazy
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool("DD_TRACE_SIDEKIQ_ANALYTICS_ENABLED", false) }
+              o.default { env_to_bool("DD_TOBOX_SIDEKIQ_ANALYTICS_ENABLED", false) }
               o.lazy
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float("DD_TRACE_SIDEKIQ_ANALYTICS_SAMPLE_RATE", 1.0) }
+              o.default { env_to_float("DD_TRACE_TOBOX_ANALYTICS_SAMPLE_RATE", 1.0) }
               o.lazy
             end
 

data/lib/tobox/pool.rb

@@ -5,7 +5,9 @@ module Tobox
     def initialize(configuration)
       @configuration = configuration
       @num_workers = configuration[:concurrency]
-      @workers = Array.new(@num_workers) { Worker.new(configuration) }
+      @workers = Array.new(@num_workers) do |idx|
+        Worker.new("tobox-worker-#{idx}", configuration)
+      end
       start
     end
 

data/lib/tobox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tobox
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/tobox/worker.rb

@@ -2,10 +2,10 @@
 
 module Tobox
   class Worker
-    def initialize(configuration)
+    def initialize(label, configuration)
       @wait_for_events_delay = configuration[:wait_for_events_delay]
       @handlers = configuration.handlers || {}
-      @fetcher = Fetcher.new(configuration)
+      @fetcher = Fetcher.new(label, configuration)
       @finished = false
 
       return unless (message_to_arguments = configuration.arguments_handler)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tobox
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - HoneyryderChuck
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel