bellbro 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f80161fa7b7eff787e56b318ffd60b31db7ac06
-  data.tar.gz: d8d60490af0e0b9e69ffc64925f1a9c14635afcd
+  metadata.gz: 7972910ac6f1f1bb5d63498b04dce2c62e0a40f7
+  data.tar.gz: eb62c1ae4184d2484c814542819934dd55c2e4af
 SHA512:
-  metadata.gz: 345da04d9bbd62965fef9621577b0732520b9dede48c04b9de5263ff5bbecfa1dd42e18f828479e359a4cae7c37a09664b7dbeb72463405800b2fe2daeedf069
-  data.tar.gz: 91fd5fdf99169e189f42a62f8ceff82585366b7b769cc06cfb8998826bc2e2724973b9a47bb84255b448073af35d205e8e445410da68834e59ff5d4377801ab0
+  metadata.gz: 99e337067fe1357a3fba9d8776e9c65d6133f726dec8517c62d8e571fbd589c1b14fa66d989c5143d110f747e6f339ca2b6d0ceb2c0225f0b5efa659a9d6febc
+  data.tar.gz: d4c61918923e5b993ac00a008deffee47b086ded6b0ca79e8624852e5ccd60dd98a706034f64b88bad9a512cee1592e1fa717a203fd2588695229787674c9e81

data/lib/bellbro.rb

@@ -14,7 +14,7 @@ require 'airbrake'
     bellbro/retryable.rb
     bellbro/ringable.rb
     bellbro/trackable.rb
-    bellbro/pool.rb
+    bellbro/redis_pool.rb
     bellbro/sidekiq_utils.rb
     bellbro/bell.rb
     bellbro/service.rb

data/lib/bellbro/initialize.rb

@@ -1,30 +1,24 @@
 module Bellbro
-  def self.initialize!
+  def self.initialize_redis!
     return unless defined?(Rails)
     filename = "#{Rails.root}/config/redis.yml"
     return unless File.exists?(filename)
-
     config = YAML.load_file(filename)[Rails.env]
-    url = Figaro.env.send(config['url'].downcase)
-    size = config['pool']
-
-    puts "## Initializing redis pool with size #{size} and url #{url}"
-    pool = ConnectionPool.new(size: size) do
-      Redis.new(url: url)
-    end
+    configure_bellbro(config)
+  end
 
-    directory = ThreadSafe::Cache.new
+  def self.configure_bellbro(config)
+    redis_url = Figaro.env.redis_url
+    databases = ThreadSafe::Cache.new
     config['databases'].each do |name, db|
       puts "## Db name #{name} mapped to #{db}"
-      directory[name.to_sym] = db
+      databases[name.to_sym] = db
     end
 
-    Bellbro::Settings.configure do |config|
-      config.connection_pool = pool
-      config.db_directory = directory
+    Bellbro::Settings.configure do |con|
+      con.redis_databases = databases
+      con.redis_url = redis_url
+      con.redis_pool_size = config['pool']
     end
   end
 end
-
-Bellbro.initialize!
-

data/lib/bellbro/redis_pool.rb

@@ -0,0 +1,38 @@
+module Bellbro
+  module RedisPool
+    def with_connection
+      self.class.with_connection do |c|
+        yield c
+      end
+    end
+
+    def self.included(klass)
+      class << klass
+
+        def set_db(default)
+          @default_db_name = default.to_sym
+        end
+
+        def with_connection
+          retryable(sleep: 0.5) do
+            Sidekiq.redis do |c|
+              c.select(model_db)
+              val = yield c
+              c.select(sidekiq_db)
+              val
+            end
+          end
+        end
+
+        def model_db
+          @model_db ||= Bellbro::Settings.redis_databases[@default_db_name]
+        end
+
+        def sidekiq_db
+          @sidekiq_db ||= Bellbro::Settings.redis_databases[:sidekiq]
+        end
+      end
+
+    end
+  end
+end

data/lib/bellbro/service.rb

@@ -52,13 +52,13 @@ module Bellbro
 
     def run
       ring "Starting #{self.class} service."
-      Service.mutex.synchronize { track }
+      self.class.mutex.synchronize { track }
       begin
-        Service.mutex.synchronize { start_jobs }
-        Service.mutex.synchronize { status_update }
+        self.class.mutex.synchronize { start_jobs }
+        self.class.mutex.synchronize { status_update }
         sleep
       end until @done
-      Service.mutex.synchronize { stop_tracking }
+      self.class.mutex.synchronize { stop_tracking }
     end
 
     def start_jobs

data/lib/bellbro/settings.rb

@@ -2,7 +2,7 @@ module Bellbro
   module Settings
 
     class SettingsData < Struct.new(
-        :logger, :env, :connection_pool, :db_directory
+        :logger, :env, :redis_databases, :redis_pool_size, :redis_url
     )
     end
 
@@ -24,14 +24,19 @@ module Bellbro
       configuration.env == 'test'
     end
 
-    def self.connection_pool
+    def self.redis_databases
       return unless configured?
-      configuration.connection_pool
+      configuration.redis_databases
     end
 
-    def self.db_directory
+    def self.redis_pool_size
       return unless configured?
-      configuration.db_directory
+      configuration.redis_pool_size
+    end
+
+    def self.redis_url
+      return unless configured?
+      configuration.redis_url
     end
 
     def self.logger

data/lib/bellbro/version.rb

@@ -1,3 +1,3 @@
 module Bellbro
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bellbro
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Jon Stokes
@@ -140,7 +140,7 @@ files:
 - lib/bellbro/hooks.rb
 - lib/bellbro/initialize.rb
 - lib/bellbro/keyable.rb
-- lib/bellbro/pool.rb
+- lib/bellbro/redis_pool.rb
 - lib/bellbro/retryable.rb
 - lib/bellbro/ringable.rb
 - lib/bellbro/service.rb

data/lib/bellbro/pool.rb

@@ -1,37 +0,0 @@
-module Bellbro
-  module Pool
-
-    def with_connection(key: nil)
-      key ||= db_name
-      db = directory(key)
-      retryable(sleep: 0.5) do
-        Bellbro::Settings.connection_pool.with do |c|
-          c.select(db)
-          yield c
-        end
-      end
-    end
-
-    def db_name
-      self.class.db_name
-    end
-
-    def directory(name)
-      Bellbro::Settings.db_directory[name]
-    end
-
-    def self.included(klass)
-      klass.extend(self)
-
-      class << klass
-        def set_db(db_name)
-          @db_name = db_name
-        end
-        
-        def db_name
-          @db_name
-        end
-      end
-    end
-  end
-end