workhorse 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8b46dee93b4c068a0448cede864128197aea8393c592527402bd42a2d7d5412
-  data.tar.gz: e808736be9666ff28aa8e16db00894a2668d23fec91b29aa6a4af6d5aaf45cdf
+  metadata.gz: 5b1cc4ec91d5c8cde5e214aff39f298f3fa9591b6693250158250fd8de87dd19
+  data.tar.gz: e333e77dc8bb0a24b809324a54d014f56b9373ccc0f16dc5f58052fa7bd1bbe3
 SHA512:
-  metadata.gz: 5b80105eae609607dc11fc044d62e764222c110e735600ae1eae432ff36916e7a554c63b964d95a08d6730f4c78ba0b509aab37ae6860b76f60250adda6c495d
-  data.tar.gz: 957e7f435fb08673307907689fcd0d0c46ab434362ec629a6f5ff7ba5cf50dd138f6042530ce44f289ee900fa5359b787884f5405a935a312e6da38155d7fd24
+  metadata.gz: af21dcc9cf0672dc71ae1b5ec2d61e6245cf6a24fc4b599d1c21c36c06e20cbc46b59248ea0b6232589eced87305c408cbe7254e6817fdb5bb2ec294181e87a7
+  data.tar.gz: 368889c80a413ad8e0343a5227ba70081470931e427ca7ec7c1b1bad6cee59af2a2f9bffe31fb879f1d1a81f2233f506cb038d896dce08b2551733873c013f1f

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Workhorse Changelog
 
+## 1.2.6 - 2022-01-11
+
+* Add daemon command `restart-logging`, which sends a `HUP` interrupt to all
+  Workhorse processes which in turn reopen the log files. This is particularly
+  useful to call after log files have been rotated, e.g. using `logrotate`.
+
+  Sitrox reference: #64690.
+
 ## 1.2.5 - 2021-11-01
 
 * Add config settings for configuring {Workhorse::Jobs::DetectStaleJobsJob}:

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 - 2021 Sitrox
+Copyright (c) 2017 - 2022 Sitrox
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -441,4 +441,4 @@ Please consult the [FAQ](FAQ.md).
 
 ## Copyright
 
-Copyright © 2021 Sitrox. See `LICENSE` for further details.
+Copyright © 2017 - 2022 Sitrox. See `LICENSE` for further details.

data/VERSION

@@ -1 +1 @@
-1.2.5
+1.2.6

data/lib/workhorse/daemon/shell_handler.rb

@@ -26,6 +26,8 @@ module Workhorse
           exit daemon.watch
         when 'restart'
           exit daemon.restart
+        when 'restart-logging'
+          exit daemon.restart_logging
         when 'usage'
           usage
           exit 99
@@ -68,6 +70,10 @@ Options:
   restart
     Shortcut for consecutive 'stop' and 'start'.
 
+  restart-logging
+    Re-opens log files, useful e.g. after the log files have been moved or
+    removed by log rotation.
+
   usage
     Show this message
 

data/lib/workhorse/daemon.rb

@@ -120,6 +120,24 @@ module Workhorse
       return start
     end
 
+    def restart_logging
+      code = 0
+
+      for_each_worker do |worker|
+        pid_file, pid = read_pid(worker)
+
+        begin
+          Process.kill 'HUP', pid
+          puts "Worker (#{worker.name}) ##{worker.id}: Sent signal for restart-logging"
+        rescue Errno::ESRCH
+          warn "Worker (#{worker.name}) ##{worker.id}: Could not send signal for restart-logging, process not found"
+          code = 1
+        end
+      end
+
+      return code
+    end
+
     private
 
     def for_each_worker(&block)
@@ -150,6 +168,10 @@ module Workhorse
       File.delete(pid_file)
     end
 
+    def hup_worker(pid)
+      Process.kill('HUP', pid)
+    end
+
     def process_name(worker)
       if defined?(Rails)
         path = Rails.root

data/lib/workhorse/worker.rb

@@ -2,6 +2,7 @@ module Workhorse
   class Worker
     LOG_LEVELS = %i[fatal error warn info debug].freeze
     SHUTDOWN_SIGNALS = %w[TERM INT].freeze
+    LOG_REOPEN_SIGNAL = 'HUP'.freeze
 
     attr_reader :queues
     attr_reader :state
@@ -87,6 +88,7 @@ module Workhorse
         log 'Started up'
 
         trap_termination if @auto_terminate
+        trap_log_reopen
       end
     end
 
@@ -152,6 +154,18 @@ module Workhorse
       end
     end
 
+    def trap_log_reopen
+      Signal.trap(LOG_REOPEN_SIGNAL) do
+        Thread.new do
+          logger.reopen
+
+          if defined?(ActiveRecord::Base) && ActiveRecord::Base.logger && ActiveRecord::Base.logger != logger
+            ActiveRecord::Base.logger.reopen
+          end
+        end.join
+      end
+    end
+
     def trap_termination
       SHUTDOWN_SIGNALS.each do |signal|
         Signal.trap(signal) do

data/workhorse.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: workhorse 1.2.5 ruby lib
+# stub: workhorse 1.2.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "workhorse".freeze
-  s.version = "1.2.5"
+  s.version = "1.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sitrox".freeze]
-  s.date = "2021-11-01"
+  s.date = "2022-01-11"
   s.files = [".github/workflows/ruby.yml".freeze, ".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, "CHANGELOG.md".freeze, "FAQ.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "RUBY_VERSION".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/rubocop".freeze, "lib/active_job/queue_adapters/workhorse_adapter.rb".freeze, "lib/generators/workhorse/install_generator.rb".freeze, "lib/generators/workhorse/templates/bin/workhorse.rb".freeze, "lib/generators/workhorse/templates/config/initializers/workhorse.rb".freeze, "lib/generators/workhorse/templates/create_table_jobs.rb".freeze, "lib/workhorse.rb".freeze, "lib/workhorse/daemon.rb".freeze, "lib/workhorse/daemon/shell_handler.rb".freeze, "lib/workhorse/db_job.rb".freeze, "lib/workhorse/enqueuer.rb".freeze, "lib/workhorse/jobs/cleanup_succeeded_jobs.rb".freeze, "lib/workhorse/jobs/detect_stale_jobs_job.rb".freeze, "lib/workhorse/jobs/run_active_job.rb".freeze, "lib/workhorse/jobs/run_rails_op.rb".freeze, "lib/workhorse/performer.rb".freeze, "lib/workhorse/poller.rb".freeze, "lib/workhorse/pool.rb".freeze, "lib/workhorse/scoped_env.rb".freeze, "lib/workhorse/worker.rb".freeze, "test/active_job/queue_adapters/workhorse_adapter_test.rb".freeze, "test/lib/db_schema.rb".freeze, "test/lib/jobs.rb".freeze, "test/lib/test_helper.rb".freeze, "test/workhorse/db_job_test.rb".freeze, "test/workhorse/enqueuer_test.rb".freeze, "test/workhorse/performer_test.rb".freeze, "test/workhorse/poller_test.rb".freeze, "test/workhorse/pool_test.rb".freeze, "test/workhorse/worker_test.rb".freeze, "workhorse.gemspec".freeze]
   s.rubygems_version = "3.0.3".freeze
   s.summary = "Multi-threaded job backend with database queuing for ruby.".freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workhorse
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Sitrox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler