chewy_kiqqer 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69fa520fad10a08f620c667e91f1b133ac7e8adf
-  data.tar.gz: 6d8ab912f3eb918570395081cc4e89720e286b7e
+  metadata.gz: b91b694c61a6898e20ac484811ce3ca4634028e0
+  data.tar.gz: a5aa154c0a8f35df90c25d138e4db11d0951aa0d
 SHA512:
-  metadata.gz: 7459fef7cf824e5d833636876c4e09c6ad3c44ebb26e2c99e9bf7e96e775eff5845076f2ba55d4574cd75cb6b235190504e93b6547612fa204c1bc6bebbf56f1
-  data.tar.gz: fdf22831d0609f93fa8fc23b1d69ded783baf684af20507b708867784ae9003800db5352bc58a77e08cf7a1254a9dcc3ee17474cd914b8cc1c2b78cc1bcef0ae
+  metadata.gz: 96a02ad4c2ecd1ef0867396b66ca485c2e73fc0606b559b0b977861cbef20bdf66ca372840f50846a0431ebba2afd9b942df501a0dad6f8e6635bd54a189b3bf
+  data.tar.gz: 433ae9028d1f6721d75192450b7e7ab713a08b80948e8af1b2d20c1351f5915a4e34be3dfbf9fdc96fc1f3b7ec91c5384faf3f84daa92503222695866c236f3c

data/lib/chewy_kiqqer.rb

@@ -5,7 +5,7 @@ require "chewy_kiqqer/version"
 require "chewy_kiqqer/mixin"
 require "chewy_kiqqer/worker"
 require "chewy_kiqqer/index"
-require "chewy_kiqqer/logger"
+require "chewy_kiqqer/config"
 require "chewy_kiqqer/log_subscriber"
 
 

data/lib/chewy_kiqqer/config.rb

@@ -0,0 +1,23 @@
+require 'logger'
+
+module ChewyKiqqer
+
+  def self.logger
+    @logger
+  end
+
+  def self.logger=(value)
+    @logger = value
+  end
+
+  # Locking scope for redis locks. Only necessary if
+  # one redis instances locks more than one application
+  def self.locking_scope=(value)
+    @locking_scope = value
+  end
+
+  def self.locking_scope
+    @locking_scope || 'default'
+  end
+
+end

data/lib/chewy_kiqqer/version.rb

@@ -1,3 +1,3 @@
 module ChewyKiqqer
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/chewy_kiqqer/worker.rb

@@ -17,7 +17,7 @@ module ChewyKiqqer
 
     def with_lock(index_name, ids)
       Sidekiq.redis do |redis|
-        lock_name = "#{index_name}-#{ids.join('-')}"
+        lock_name = "chewy-kiqqer:#{ChewyKiqqer.locking_scope}:#{index_name}-#{ids.join('-')}"
         redis.lock(lock_name, life: 60, acquire: 5) { index(index_name, ids) }
       end
     end

data/spec/config_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe 'config' do
+  context '#logger' do
+
+    after(:each) { ChewyKiqqer.logger = nil }
+
+    it 'can be set from the outside' do
+      ChewyKiqqer.logger = :nolog
+      expect(ChewyKiqqer.logger).to eq(:nolog)
+    end
+
+  end
+
+  context '#locking_scope' do
+
+    after(:each) { ChewyKiqqer.locking_scope = nil }
+
+    it 'can be set from the outside' do
+      ChewyKiqqer.locking_scope = '42'
+      expect(ChewyKiqqer.locking_scope).to eq('42')
+    end
+
+    it 'has a default' do
+      expect(ChewyKiqqer.locking_scope).to eq('default')
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chewy_kiqqer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Daniel Hahn
@@ -151,15 +151,15 @@ files:
 - Rakefile
 - chewy_kiqqer.gemspec
 - lib/chewy_kiqqer.rb
+- lib/chewy_kiqqer/config.rb
 - lib/chewy_kiqqer/index.rb
 - lib/chewy_kiqqer/log_subscriber.rb
-- lib/chewy_kiqqer/logger.rb
 - lib/chewy_kiqqer/mixin.rb
 - lib/chewy_kiqqer/version.rb
 - lib/chewy_kiqqer/worker.rb
+- spec/config_spec.rb
 - spec/index_spec.rb
 - spec/log_subscriber_spec.rb
-- spec/logger_spec.rb
 - spec/mixin_spec.rb
 - spec/spec_helper.rb
 - spec/worker_spec.rb
@@ -189,9 +189,9 @@ specification_version: 4
 summary: Small helper gem that allows you to automatically run all chewy index updates
   in sidekiq
 test_files:
+- spec/config_spec.rb
 - spec/index_spec.rb
 - spec/log_subscriber_spec.rb
-- spec/logger_spec.rb
 - spec/mixin_spec.rb
 - spec/spec_helper.rb
 - spec/worker_spec.rb

data/lib/chewy_kiqqer/logger.rb

@@ -1,13 +0,0 @@
-require 'logger'
-
-module ChewyKiqqer
-
-  def self.logger
-    @logger
-  end
-
-  def self.logger=(value)
-    @logger = value
-  end
-
-end

data/spec/logger_spec.rb

@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-describe '#logger' do
-
-
-  after(:each) { ChewyKiqqer.logger = nil }
-
-  it 'can be set from the outside' do
-    ChewyKiqqer.logger = :nolog
-    expect(ChewyKiqqer.logger).to eq(:nolog)
-  end
-
-
-end