skiplock 1.1.4 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ebc3d59d7709f435ee1f2ecb3773b0f8d64361c80c01a23c8a4a4bd89972874
-  data.tar.gz: 8f3a5cbdbfe91b9ef61207a4655552363b9a0fdd4d8caf29c1c6e83c7135f80e
+  metadata.gz: 9dc423c28696ac2e1a85e87cbc5bb97d601fbbaa14a10e58f11945863d3bd04f
+  data.tar.gz: 459d76ff36b464020fb43986713e744500f3f0a2fb0910ee6cec6bd082147630
 SHA512:
-  metadata.gz: a4d693051b2bfc567ccd1407ea26f8105ab3997e2e75452fdb037c0b2bd8d235c0075a320703e0c0b0ed77d2f326bcbf1efebdf87f0a3df82c9bee23111011d0
-  data.tar.gz: 2554c0c9449429890fcdd7614791cae475e3ede8299c70df87ed94857a2ec165e89d1770d70e226cd0f06db8ae4d49d523de377e536043f6bf8f98da5a21aa2b
+  metadata.gz: a9442d819c8eff5cb5df09a58b698dc6ce72d579971519c8947a9e7341b67617d5d1977783474b0602a12ea63a8271be9ddd0320a16062d36b9adfa077f30905
+  data.tar.gz: 2d5fa15b5f165c8ded5aa5fa46a2a0710b53f8379c7d4c56685d37353158f365480fce6203323f20693384deaf092d69bc03efad05f35c500ec2c4a53b7a4b09

data/README.md

@@ -54,8 +54,10 @@ The library is quite small compared to other PostgreSQL job queues (eg. *delay_j
     min_threads: 1
     max_threads: 10
     max_retries: 20
-    logfile: skiplock.log
-    loglevel: info
+    log_file: skiplock.log
+    log_level: info
+    log_count: 5
+    log_size: 10485760
     namespace:
     notification: custom
     extensions: false
@@ -70,8 +72,10 @@ The library is quite small compared to other PostgreSQL job queues (eg. *delay_j
     - **min_threads** (*integer*): sets minimum number of threads staying idle
     - **max_threads** (*integer*): sets the maximum number of threads allowed to run jobs
     - **max_retries** (*integer*): sets the maximum attempt a job will be retrying before it is marked expired.  See `Retry system` for more details
-    - **logfile** (*string*): filename for skiplock logs; empty logfile will disable logging
-    - **loglevel** (*string*): sets logging level (`debug, info, warn, error, fatal, unknown`)
+    - **log_file** (*string*): filename for skiplock logs; empty logfile will disable logging
+    - **log_level** (*string*): sets logging level (`debug, info, warn, error, fatal, unknown`)
+    - **log_count** (*integer*): number of log files to keep (ie: log rotation)
+    - **log_size** (*integer*): maximum size per log file (in bytes)
     - **namespace** (*string*): sets namespace for jobs (workers will only process jobs of specified namespace)
     - **notification** (*string*): sets the library to be used for notifying errors and exceptions (`auto, airbrake, bugsnag, exception_notification, custom`); using `auto` will detect library if available.  See `Notification system` for more details
     - **extensions** (*multi*): enable or disable the class method extension.  See `ClassMethod extension` for more details

data/bin/skiplock

@@ -6,8 +6,10 @@ begin
   op = OptionParser.new do |opts|
     opts.banner = "Usage: #{File.basename($0)} [options]"
     opts.on('-e', '--environment STRING', String, 'Rails environment')
-    opts.on('-l', '--logfile STRING', String, 'Log filename')
-    opts.on('-L', '--loglevel STRING', String, 'Log level (debug, info, warn, error, fatal, unknown)')
+    opts.on('-l', '--log-file STRING', String, 'Log filename')
+    opts.on('-L', '--log-level STRING', String, 'Log level (debug, info, warn, error, fatal, unknown)')
+    opts.on('-m', '--log-count NUM', Integer, 'Log maximum count (default = 5)')
+    opts.on('-M', '--log-size NUM', Integer, 'Log maximum size (in bytes, default = 10485760)')
     opts.on('-n', '--namespace STRING', String, 'Job namespace')
     opts.on('-s', '--graceful-shutdown NUM', Integer, 'Number of seconds to wait for graceful shutdown')
     opts.on('-r', '--max-retries NUM', Integer, 'Number of maxixum retries')

data/lib/skiplock/job.rb

@@ -44,7 +44,7 @@ module Skiplock
       Dir.glob('tmp/skiplock/*').each do |f|
         disposed = true
         if self.exists?(id: File.basename(f), running: true)
-          job = YAML.load_file(f) rescue nil
+          job = YAML.respond_to?(:unsafe_load_file) ? YAML.unsafe_load_file(f) : YAML.load_file(f)
           disposed = job.dispose if job.is_a?(Skiplock::Job)
         end
         (File.delete(f) rescue nil) if disposed

data/lib/skiplock/manager.rb

@@ -85,8 +85,12 @@ module Skiplock
       @logger.info "             Max threads: #{@config[:max_threads]}"
       @logger.info "             Environment: #{Rails.env}"
       @logger.info "               Namespace: #{@config[:namespace] || '(nil)'}"
-      @logger.info "                Loglevel: #{@config[:loglevel]}"
-      @logger.info "                 Logfile: #{@config[:logfile] || '(disabled)'}"
+      @logger.info "               Log level: #{@config[:log_level]}"
+      if @config[:log_file]
+        @logger.info "               Log count: #{@config[:log_count]}"
+        @logger.info "                Log size: #{@config[:log_size]}"
+      end
+      @logger.info "                Log file: #{@config[:log_file] || '(disabled)'}"
       @logger.info "                 Workers: #{@config[:workers]}"
       @logger.info "                  Queues: #{@config[:queues].map {|k,v| k + '(' + v.to_s + ')'}.join(', ')}" if @config[:queues].is_a?(Hash)
       @logger.info "                     PID: #{Process.pid}"
@@ -140,18 +144,30 @@ module Skiplock
     end
 
     def setup_logger
-      @config[:loglevel] = 'info' unless ['debug','info','warn','error','fatal','unknown'].include?(@config[:loglevel].to_s)
-      @logger = ActiveSupport::BroadcastLogger.new(::Logger.new(STDOUT))
-      @logger.level = @config[:loglevel].to_sym
+      @config[:log_level] = 'info' unless ['debug','info','warn','error','fatal','unknown'].include?(@config[:log_level].to_s)
+      if defined?(ActiveSupport::BroadcastLogger)
+        @logger = ActiveSupport::BroadcastLogger.new(::Logger.new(STDOUT))
+      else
+        @logger = ActiveSupport::Logger.new(STDOUT)
+      end
+      @logger.level = @config[:log_level].to_sym
       Skiplock.logger = @logger
-      if @config[:logfile].to_s.length > 0
-        @logger.broadcast_to(::Logger.new(File.join(Rails.root, 'log', @config[:logfile].to_s), 'daily'))
+      if @config[:log_file].to_s.length > 0
+        if defined?(ActiveSupport::BroadcastLogger)
+          @logger.broadcast_to(::Logger.new(File.join(Rails.root, 'log', @config[:log_file].to_s), @config[:log_count] || 5, @config[:log_size] || 10485760))
+        else
+          @logger.extend(ActiveSupport::Logger.broadcast(::Logger.new(File.join(Rails.root, 'log', @config[:log_file].to_s), @config[:log_count] || 5, @config[:log_size] || 10485760)))
+        end
         ActiveJob::Base.logger = nil
       end
       if @config[:standalone]
-        Rails.logger.reopen('/dev/null') rescue Rails.logger.reopen('NUL') # supports Windows NUL device
-        Rails.logger.level = @logger.level
-        Rails.logger.extend(ActiveSupport::Logger.broadcast(@logger))
+        if defined?(ActiveSupport::BroadcastLogger)
+          Rails.logger = @logger
+        else
+          Rails.logger.reopen('/dev/null') rescue Rails.logger.reopen('NUL') # supports Windows NUL device
+          Rails.logger.level = @logger.level
+          Rails.logger.extend(ActiveSupport::Logger.broadcast(@logger))
+        end
       end
     rescue Exception => ex
       @logger.error "Exception with logger: #{ex.to_s}"

data/lib/skiplock/version.rb

@@ -1,4 +1,3 @@
 module Skiplock
-  VERSION = Version = '1.1.4'
+  VERSION = Version = '1.1.7'
 end
-

data/lib/skiplock.rb

@@ -11,7 +11,7 @@ require 'skiplock/worker'
 require 'skiplock/version'
 
 module Skiplock
-  DEFAULT_CONFIG = { 'graceful_shutdown' => 15, 'min_threads' => 1, 'max_threads' => 10, 'max_retries' => 20, 'logfile' => 'skiplock.log', 'loglevel' => 'info', 'namespace' => nil, 'notification' => 'custom', 'extensions' => false, 'purge_completion' => true, 'queues' => { 'default' => 100, 'mailers' => 999 }, 'workers' => 0 }.freeze
+  DEFAULT_CONFIG = { 'graceful_shutdown' => 15, 'min_threads' => 1, 'max_threads' => 10, 'max_retries' => 20, 'log_file' => 'skiplock.log', 'log_level' => 'info', 'log_count' => 5, 'log_size' => 10485760, 'namespace' => nil, 'notification' => 'custom', 'extensions' => false, 'purge_completion' => true, 'queues' => { 'default' => 100, 'mailers' => 999 }, 'workers' => 0 }.freeze
 
   def self.logger=(l)
     @logger = l

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skiplock
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.7
 platform: ruby
 authors:
 - Tin Vo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-24 00:00:00.000000000 Z
+date: 2024-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob