postburner 1.0.0.pre.3 → 1.0.0.pre.5

data/app/views/postburner/jobs/show.html.haml

@@ -6,8 +6,8 @@
   (#{@job.run_at.to_i - Time.zone.now.to_i} seconds)
 
 %h3 Stats
-- if @job.beanstalk_job
-  %pre= JSON.pretty_generate @job.beanstalk_job.stats.as_json
+- if @job.bk
+  %pre= JSON.pretty_generate @job.bk.stats.as_json
 
 %h3 Job
 %pre= JSON.pretty_generate @job.as_json

data/bin/postburner

@@ -55,37 +55,6 @@ require File.expand_path('config/environment', Dir.pwd)
 
 # Postburner is loaded automatically via the Rails engine when the gem is in your Gemfile
 
-# Load configuration
-config_path = File.expand_path(options[:config], Dir.pwd)
-
-begin
-  config = Postburner::Configuration.load_yaml(config_path, options[:env], options[:worker])
-rescue ArgumentError => e
-  Rails.logger.error "[Postburner] ERROR: #{e.message}"
-  exit 1
-end
-
-# Filter queues if --queues option provided
-if options[:queues]
-  # Validate that all specified queues exist in config
-  invalid_queues = options[:queues] - config.queue_names
-  unless invalid_queues.empty?
-    config.logger.error "[Postburner] ERROR: Unknown queue(s): #{invalid_queues.join(', ')}"
-    config.logger.error "[Postburner] Available queues: #{config.queue_names.join(', ')}"
-    exit 1
-  end
-
-  # Filter config to only include specified queues
-  filtered_queues = config.queues.select { |name, _| options[:queues].include?(name.to_s) }
-  config.queues = filtered_queues
-end
-
-config.logger.info "[Postburner] Configuration: #{config_path}"
-config.logger.info "[Postburner] Environment: #{options[:env]}"
-config.logger.info "[Postburner] Worker: #{options[:worker] || '(auto-selected)'}" if options[:worker] || options[:queues].nil?
-config.logger.info "[Postburner] Queues: #{config.queue_names.join(', ')}"
-config.logger.info "[Postburner] Defaults: forks=#{config.default_forks}, threads=#{config.default_threads}, gc_limit=#{config.default_gc_limit || 'none'}"
-
-# Create and start worker
-worker = Postburner::Workers::Worker.new(config)
-worker.start
+# Create and run worker
+runner = Postburner::Runner.new(options)
+runner.run

data/lib/postburner/runner.rb

@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+module Postburner
+  # Shared runner logic for bin/postburner and rake tasks.
+  #
+  # Provides a unified interface for starting Postburner workers from
+  # both the command-line executable and Rake tasks. Handles configuration
+  # loading, queue filtering, logging, and worker startup.
+  #
+  # @example Using from bin/postburner
+  #   options = { config: 'config/postburner.yml', env: 'production', worker: 'default' }
+  #   runner = Postburner::Runner.new(options)
+  #   runner.run
+  #
+  # @example Using from Rake task
+  #   options = { worker: ENV['WORKER'], queues: ENV['QUEUES']&.split(',') }
+  #   runner = Postburner::Runner.new(options)
+  #   runner.run
+  #
+  class Runner
+    attr_reader :options
+
+    # Initialize runner with options.
+    #
+    # @param options [Hash] Runner options
+    # @option options [String] :config Path to YAML configuration file (default: 'config/postburner.yml')
+    # @option options [String] :env Environment name (default: RAILS_ENV or 'development')
+    # @option options [String, nil] :worker Worker name from config (required if multiple workers defined)
+    # @option options [Array<String>, nil] :queues List of queue names to filter (overrides config)
+    def initialize(options = {})
+      @options = {
+        config: 'config/postburner.yml',
+        env: ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development',
+        worker: nil,
+        queues: nil
+      }.merge(options)
+    end
+
+    # Load configuration, filter queues, and start worker.
+    #
+    # @return [void]
+    def run
+      config = load_configuration
+      filter_queues(config) if options[:queues]
+      log_configuration(config)
+      start_worker(config)
+    end
+
+    private
+
+    # Load configuration from YAML file.
+    #
+    # @return [Postburner::Configuration]
+    def load_configuration
+      config_path = File.expand_path(options[:config], root_directory)
+      Postburner::Configuration.load_yaml(config_path, options[:env], options[:worker])
+    rescue ArgumentError => e
+      logger.error "[Postburner] ERROR: #{e.message}"
+      exit 1
+    end
+
+    # Filter configuration to only include specified queues.
+    #
+    # @param config [Postburner::Configuration]
+    # @return [void]
+    def filter_queues(config)
+      # Validate that all specified queues exist in config
+      invalid_queues = options[:queues] - config.queue_names
+      unless invalid_queues.empty?
+        config.logger.error "[Postburner] ERROR: Unknown queue(s): #{invalid_queues.join(', ')}"
+        config.logger.error "[Postburner] Available queues: #{config.queue_names.join(', ')}"
+        exit 1
+      end
+
+      # Filter config to only include specified queues
+      filtered_queues = config.queues.select { |name, _| options[:queues].include?(name.to_s) }
+      config.queues = filtered_queues
+    end
+
+    # Log configuration details.
+    #
+    # @param config [Postburner::Configuration]
+    # @return [void]
+    def log_configuration(config)
+      config_path = File.expand_path(options[:config], root_directory)
+      config.logger.info "[Postburner] Configuration: #{config_path}"
+      config.logger.info "[Postburner] Environment: #{options[:env]}"
+      config.logger.info "[Postburner] Worker: #{options[:worker] || '(auto-selected)'}" if options[:worker] || options[:queues].nil?
+      config.logger.info "[Postburner] Queues: #{config.queue_names.join(', ')}"
+      config.logger.info "[Postburner] Defaults: forks=#{config.default_forks}, threads=#{config.default_threads}, gc_limit=#{config.default_gc_limit || 'none'}"
+    end
+
+    # Returns root directory for config file resolution.
+    #
+    # Uses Rails.root when Rails is defined, otherwise falls back to current directory.
+    #
+    # @return [String] Root directory path
+    def root_directory
+      if defined?(Rails) && Rails.respond_to?(:root)
+        Rails.root.to_s
+      else
+        Dir.pwd
+      end
+    end
+
+    # Create and start worker.
+    #
+    # @param config [Postburner::Configuration]
+    # @return [void]
+    def start_worker(config)
+      worker = Postburner::Workers::Worker.new(config)
+      worker.start
+    end
+
+    # Returns logger for error reporting during initialization.
+    #
+    # @return [Logger]
+    def logger
+      if defined?(Rails)
+        Rails.logger
+      else
+        Logger.new($stderr)
+      end
+    end
+  end
+end

data/lib/postburner/strategies/queue.rb

@@ -76,20 +76,27 @@ module Postburner
         #debugger
         Postburner::Job.transaction do
           Postburner.connected do |conn|
-            tube_name = job.tube_name
+            tube_name = job.expanded_tube_name
             data = { class: job.class.name, args: [job.id] }
 
             # Get priority, TTR from job instance (respects instance overrides) or options
             pri = options[:pri] || job.priority || Postburner.configuration.default_priority
-            delay = options[:delay] || 0
+            delay = options[:delay].present? ? [0, options[:delay].to_i].max : 0
             ttr = options[:ttr] || job.ttr || Postburner.configuration.default_ttr
+            payload = JSON.generate(data)
 
-            response = conn.tubes[tube_name].put(
-              JSON.generate(data),
-              pri: pri,
-              delay: delay,
-              ttr: ttr
-            )
+            begin
+              response = conn.tubes[tube_name].put(
+                payload,
+                pri: pri,
+                delay: delay,
+                ttr: ttr
+              )
+            rescue Beaneater::BadFormatError => e
+              raise Postburner::Job::BadFormat.new(
+                "Beanstalkd BAD_FORMAT: tube=#{tube_name} payload=#{payload} pri=#{pri.inspect} delay=#{delay.inspect} ttr=#{ttr.inspect}"
+              ), cause: e
+            end
 
             response
           end

data/lib/postburner/version.rb

@@ -1,3 +1,3 @@
 module Postburner
-  VERSION = '1.0.0.pre.3'
+  VERSION = '1.0.0.pre.5'
 end

data/lib/postburner.rb

@@ -1,7 +1,6 @@
 require "postburner/version"
 require "postburner/configuration"
 require "postburner/connection"
-require "postburner/queue_config"
 require "postburner/beanstalkd"
 require "postburner/tracked"
 require "postburner/active_job/payload"
@@ -9,6 +8,7 @@ require "postburner/active_job/execution"
 require "postburner/active_job/adapter"
 require "postburner/workers/base"
 require "postburner/workers/worker"
+require "postburner/runner"
 require "postburner/engine"
 require "postburner/strategies/queue"
 require "postburner/strategies/nice_queue"
@@ -450,7 +450,6 @@ module Postburner
   #
   def self.stats
     connected do |conn|
-
       {
         watched_tubes: self.watched_tubes,
         # Get all tube instances that exist on Beanstalkd

data/lib/tasks/postburner.rake

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+namespace :postburner do
+  desc "Start Postburner worker (ENV: WORKER=name, QUEUES=queue1,queue2, CONFIG=path)"
+  task work: :environment do
+    # Parse options from environment variables
+    options = {
+      config: ENV['CONFIG'] || 'config/postburner.yml',
+      env: Rails.env,
+      worker: ENV['WORKER'],
+      queues: ENV['QUEUES']&.split(',')&.map(&:strip)
+    }
+
+    # Create and run worker
+    runner = Postburner::Runner.new(options)
+    runner.run
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postburner
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.3
+  version: 1.0.0.pre.5
 platform: ruby
 authors:
 - Matt Smith
@@ -104,12 +104,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- MIT-LICENSE
 - README.md
 - Rakefile
 - app/assets/config/postburner_manifest.js
 - app/assets/stylesheets/postburner/application.css
 - app/concerns/postburner/callbacks.rb
+- app/concerns/postburner/commands.rb
+- app/concerns/postburner/execution.rb
+- app/concerns/postburner/insertion.rb
+- app/concerns/postburner/logging.rb
+- app/concerns/postburner/properties.rb
+- app/concerns/postburner/statistics.rb
 - app/controllers/postburner/application_controller.rb
 - app/controllers/postburner/jobs_controller.rb
 - app/controllers/postburner/static_controller.rb
@@ -141,7 +146,7 @@ files:
 - lib/postburner/configuration.rb
 - lib/postburner/connection.rb
 - lib/postburner/engine.rb
-- lib/postburner/queue_config.rb
+- lib/postburner/runner.rb
 - lib/postburner/strategies/immediate_test_queue.rb
 - lib/postburner/strategies/nice_queue.rb
 - lib/postburner/strategies/null_queue.rb
@@ -152,6 +157,7 @@ files:
 - lib/postburner/version.rb
 - lib/postburner/workers/base.rb
 - lib/postburner/workers/worker.rb
+- lib/tasks/postburner.rake
 - lib/tasks/postburner_tasks.rake
 homepage: https://gitlab.nearapogee.com/opensource/postburner
 licenses:

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright 2021 Matt Smith
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.