unique_thread 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a577e3fc0c14fba6313822f463fc97d7d19f0408
-  data.tar.gz: 349372ae107ba9cbd955242240be91c89e389d4e
+  metadata.gz: 84cdf521ad296d825e220ccea5b2610e70bef0dc
+  data.tar.gz: 07fe1de3059244ae0681c152fd249fdf75568d59
 SHA512:
-  metadata.gz: 7634616c9aa414db034a343ac7b55fe890bb82548541ed6004890bbcb5ba5999b33332f4cfb29f377e2e8f025f6bdef757aa5ad26afec35af7be2d8c77bc7fe5
-  data.tar.gz: 32d117b11d1ba44b76d0e7e89b7f39733501a17604fba3dcf37a12e9aac03a0c9a48b92dcdf065023570a6e519b13176b5b561a9fe30427d0170d6664ce322cf
+  metadata.gz: 34a8c80ee3e585946fc6c4d662bf0ce1f525a4506880e5f585f081cc47cf68715d14c860060d5c86f7852d154fde9ac7cbbea1fcd4767bf047c0d1e2c3271f58
+  data.tar.gz: 2f7be9c25bfa9f6fded8c7d1fb9507f06790d43b6f784c8bfe41f563c63b8dd0f9a7e313063c0d18a9133fa91eefdc551769dbc8a6cf2cb69702956a190e30c9

data/lib/unique_thread.rb

@@ -6,12 +6,36 @@ require_relative 'unique_thread/stopwatch'
 require_relative 'unique_thread/locksmith'
 
 class UniqueThread
-  attr_reader :logger, :stopwatch, :locksmith
+  class << self
+    attr_writer :logger, :redis
 
-  def initialize(name, downtime: 30, logger: default_logger, redis: Redis.new)
-    @logger    = logger
+    def logger
+      @logger ||= default_logger
+    end
+
+    def redis
+      @redis ||= Redis.new
+    end
+
+    private
+
+    def default_logger
+      case
+      when defined?(Rails) && defined?(Rails::Console)
+        Logger.new('/dev/null')
+      when defined?(Rails)
+        Rails.logger
+      else
+        Logger.new($stdout)
+      end
+    end
+  end
+
+  attr_reader :stopwatch, :locksmith
+
+  def initialize(name, downtime: 30)
     @stopwatch = Stopwatch.new(downtime: downtime)
-    @locksmith = Locksmith.new(name: name, stopwatch: stopwatch, redis: redis, logger: logger)
+    @locksmith = Locksmith.new(name: name, stopwatch: stopwatch)
   end
 
   def run(&block)
@@ -19,10 +43,10 @@ class UniqueThread
       lock = locksmith.new_lock
 
       if lock.acquired?
-        logger.info('Lock acquired! Running the unique thread.')
+        self.class.logger.info('Lock acquired! Running the unique thread.')
         lock.while_held(&block)
       else
-        logger.debug('Could not acquire the lock. Sleeping until next attempt.')
+        self.class.logger.debug('Could not acquire the lock. Sleeping until next attempt.')
         stopwatch.sleep_until_next_attempt(lock.locked_until.to_f)
       end
     end
@@ -30,23 +54,12 @@ class UniqueThread
 
   private
 
-  def self.default_logger
-    case
-    when defined?(Rails) && defined?(Rails::Console)
-      Logger.new('/dev/null')
-    when defined?(Rails)
-      Rails.logger
-    else
-      Logger.new(STDOUT)
-    end
-  end
-
   def safe_infinite_loop
     Thread.new do
       begin
         loop { yield }
       rescue StandardError => error
-        logger.error(error)
+        self.class.logger.error(error)
       end
     end
   end

data/lib/unique_thread/locksmith.rb

@@ -2,16 +2,14 @@
 
 class UniqueThread
   class Locksmith
-    attr_reader :name, :stopwatch, :redis, :logger
+    attr_reader :name, :stopwatch
 
-    def initialize(name:, stopwatch:, redis:, logger:)
+    def initialize(name:, stopwatch:)
       @name      = name
       @stopwatch = stopwatch
-      @redis     = redis
-      @logger    = logger
 
       @lua_scripts = Hash[Dir[File.join(__dir__, 'redis_lua', '*.lua')].map do |lua_file|
-        [File.basename(lua_file, '.lua').to_sym, redis.script(:load, File.read(lua_file))]
+        [File.basename(lua_file, '.lua').to_sym, UniqueThread.redis.script(:load, File.read(lua_file))]
       end]
     end
 
@@ -34,7 +32,7 @@ class UniqueThread
     attr_reader :lua_scripts
 
     def lock_from_redis_command(script, *args)
-      redis_result = RedisResult.new(*redis.evalsha(lua_scripts[script], args))
+      redis_result = RedisResult.new(*UniqueThread.redis.evalsha(lua_scripts[script], args))
 
       klass = if redis_result.lock_acquired?
                 HeldLock
@@ -42,20 +40,19 @@ class UniqueThread
                 Lock
               end
 
-      klass.new(redis_result.locked_until, stopwatch, self, logger)
+      klass.new(redis_result.locked_until, stopwatch, self)
     end
   end
 
   private
 
   class Lock
-    attr_reader :locked_until, :stopwatch, :locksmith, :logger
+    attr_reader :locked_until, :stopwatch, :locksmith
 
-    def initialize(locked_until, stopwatch, locksmith, logger)
+    def initialize(locked_until, stopwatch, locksmith)
       @locked_until = locked_until
       @stopwatch    = stopwatch
       @locksmith    = locksmith
-      @logger       = logger
     end
 
     def acquired?
@@ -75,12 +72,12 @@ class UniqueThread
     def while_held
       worker = Thread.new do
         yield
-        logger.error('The blocked passed is not an infinite loop.')
+        UniqueThread.logger.error('The blocked passed is not an infinite loop.')
       end
 
       renew_indefinitely
 
-      logger.info('Lock lost! Killing the unique thread.')
+      UniqueThread.logger.info('Lock lost! Killing the unique thread.')
       worker.terminate
     end
 
@@ -90,7 +87,7 @@ class UniqueThread
       active_lock = self
 
       while active_lock.acquired?
-        logger.debug('Lock renewed! Sleeping until next renewal attempt.')
+        UniqueThread.logger.debug('Lock renewed! Sleeping until next renewal attempt.')
         stopwatch.sleep_until_renewal_attempt
         active_lock = locksmith.renew_lock(active_lock)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unique_thread
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Fernando Seror