schked 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47adc31caf1ee8f69ba27c7b3e0a6e8f476d80186bd63fbfa8a4aa3cbb413852
-  data.tar.gz: 17d5c4f8845c2c5e4a8556506dd39b5940b06e74a56b796c4d81a9e17c7c00fe
+  metadata.gz: fe971fe49c1279ffd4cbc39948faea2fb82fa58434aa90814e1c1cbe2ebd99e2
+  data.tar.gz: 2b8800aa8128347a42e1f7fe2d73930293baae1ff258d6f1ddd24f21dff297c4
 SHA512:
-  metadata.gz: b94ce175fb4bdb168e69a7dd660fc293fb5706363f525179fd70cc336fb9bb0e8f2d5e5c5727bbdca64428ca528be2d1b769b77ee3bf38e057bf6f12291fd165
-  data.tar.gz: ec253428e530078ed21ce7edc77f49c9946ee2714ebb9b00671cbf87671f9cfe6c4a6ab5bfa0a9743671f016c8ad4e59b2fca80ad6e4c5a0be996ab2d66b97d3
+  metadata.gz: a8dcdca1dad927793b3c0f6356a1f6222a9e4081b20baca7df9391c93ea044f8f2f9bf7fa2db05c330616a0692597abbf8e2807a07d5c6f80bff0687bfd90911
+  data.tar.gz: 370cab83d6e000cbc0cb2c19be884738315434d3dd42d0bf718c1b094194231b77f8356d2782f6a7c773b98aa64f3eedc6de39f3a34206f8a3aa381645f5012e

data/lib/schked/redis_locker.rb

@@ -4,22 +4,30 @@ module Schked
   class RedisLocker
     attr_reader :lock_manager,
       :lock_id,
-      :lock_ttl
+      :lock_ttl,
+      :logger
 
     LOCK_KEY = "schked:redis_locker"
     LOCK_TTL = 60_000 # ms
 
-    def initialize(redis_servers, lock_ttl: LOCK_TTL)
+    def initialize(redis_servers, lock_ttl: LOCK_TTL, logger: Logger.new($stdout))
       @lock_manager = Redlock::Client.new(redis_servers, retry_count: 0)
       @lock_ttl = lock_ttl
+      @logger = logger
     end
 
     def lock
       valid_lock? || !!try_lock
+    rescue => e
+      logger.error("Failed to acquire a lock with error: #{e.message}")
+      false
     end
 
     def unlock
       lock_manager.unlock(lock_id) if valid_lock?
+    rescue => e
+      logger.error("Failed to release the lock with error: #{e.message}")
+      false
     end
 
     def extend_lock
@@ -28,6 +36,9 @@ module Schked
       @lock_id = lock_manager.lock(LOCK_KEY, lock_ttl, extend: lock_id, extend_only_if_locked: true)
 
       !!@lock_id
+    rescue => e
+      logger.error("Failed to extend the lock with error: #{e.message}")
+      false
     end
 
     def valid_lock?

data/lib/schked/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Schked
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/schked/worker.rb

@@ -7,7 +7,7 @@ module Schked
     def initialize(config:)
       @config = config
 
-      @locker = RedisLocker.new(config.redis_servers, lock_ttl: 40_000) unless config.standalone?
+      @locker = RedisLocker.new(config.redis_servers, lock_ttl: 40_000, logger: config.logger) unless config.standalone?
       @scheduler = Rufus::Scheduler.new(trigger_lock: locker)
 
       watch_signals
@@ -46,26 +46,29 @@ module Schked
     def define_callbacks
       cfg = config
 
-      scheduler.define_singleton_method(:on_error) do |job, error|
-        name = if job
+      scheduler.define_singleton_method(:extract_job_name) do |job|
+        if job
           job.opts[:as] || job.job_id
         else
           "unknown"
         end
-        cfg.logger.fatal("Task #{name} failed with error: #{error.message}")
+      end
+
+      scheduler.define_singleton_method(:on_error) do |job, error|
+        cfg.logger.fatal("Task #{extract_job_name(job)} failed with error: #{error.message}")
         cfg.logger.error(error.backtrace.join("\n")) if error.backtrace
 
         cfg.fire_callback(:on_error, job, error)
       end
 
       scheduler.define_singleton_method(:on_pre_trigger) do |job, time|
-        cfg.logger.info("Started task: #{job.opts[:as] || job.job_id}")
+        cfg.logger.info("Started task: #{extract_job_name(job)}")
 
         cfg.fire_callback(:before_start, job, time)
       end
 
       scheduler.define_singleton_method(:on_post_trigger) do |job, time|
-        cfg.logger.info("Finished task: #{job.opts[:as] || job.job_id}")
+        cfg.logger.info("Finished task: #{extract_job_name(job)}")
 
         cfg.fire_callback(:after_finish, job, time)
       end
@@ -85,7 +88,7 @@ module Schked
       Thread.new do
         loop do
           scheduler.shutdown(wait: 5) if @shutdown
-          sleep 0.2
+          sleep 1
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schked
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Misha Merkushin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redlock