bellbro 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaf4bedfab71b34f1b6e366ace3d9adb8b22df2b
-  data.tar.gz: 4c8743c4925b0765843210d5bd52c3b06dff0a87
+  metadata.gz: 1ddf069f8fb7bf7c4cb1d241cbbaf0071605de1f
+  data.tar.gz: 1acbf9a7c2014a9c5bd08865555690c73b1b9050
 SHA512:
-  metadata.gz: d0cd386a2c657278181334bc821796d207f1d2080928eb09d95794b6150e50f6ff8c1c104c480a90c1d15f3847301035e039fde77905fdeb033d4a9456248d5c
-  data.tar.gz: 56000b7d618440b127cd9cb58ee700ee7a736198b9f88716c45418434871c15a2c1c81324139d3fb3623cfb1f5e55561e773c2c5ce23b32b03e30c90f5b1eeb6
+  metadata.gz: e9d3ed63c20286ba8dadd89324fadfd0acf4b246bfd60b83df84ff55405c409c89e871b798db87b193acf30279deff3ab36950b74dd1fdff89f54fc3cb23b684
+  data.tar.gz: 3cfd2c21df9e06166be02c4567e0a64d11b19f92c076e6e502f0df09bffadfa7a096356d0799a60428cbd3fa50f6e18c13a368a356502cde962593fc7cefe366

data/lib/bellbro/initialize.rb

@@ -3,22 +3,59 @@ module Bellbro
     return unless defined?(Rails)
     filename = "#{Rails.root}/config/redis.yml"
     return unless File.exists?(filename)
-    config = YAML.load_file(filename)[Rails.env]
+    config = YAML.load_file(filename)[Rails.env].symbolize_keys
     configure_bellbro(config)
+    setup_pool(config)
   end
 
   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}"
-      databases[name.to_sym] = db
+    redis_config = ThreadSafe::Cache.new
+
+    config.each do |name, c|
+      base_url = Figaro.env.send c['url'].downcase
+      db = c['database']
+      url = generate_full_url(base_url, db)
+
+      redis_config[name] = {
+          size:            c['pool'],
+          url:             url,
+          database:        db,
+          timeout:         c['timeout'] || 5,
+          network_timeout: c['network_timeout'] || 5
+      }
+    end
+
+    Bellbro::Settings.configure do |con|
+      con.redis_config = redis_config
+    end
+  end
+
+  def self.setup_pool(config)
+    redis_pool = ThreadSafe::Cache.new
+    redis_config = Bellbro::Settings.redis_config
+
+    config.each_key do |name|
+      next if name == :sidekiq
+      puts "# Configuring pool #{name} with size #{redis_config[name][:size]} on #{redis_config[name][:url]}"
+      redis_pool[name] = ConnectionPool.new(
+         redis_config[name].slice(:size, :timeout)
+      ) do
+        Redis.new(
+          redis_config[name].slice(:url, :network_timeout)
+        )
+      end
     end
 
     Bellbro::Settings.configure do |con|
-      con.redis_databases = databases
-      con.redis_url = redis_url
-      con.redis_pool_size = config['pool']
+      con.redis_pool = redis_pool
+    end
+  end
+
+  def self.generate_full_url(base_url, db)
+    if base_url[-1,1] == "/"
+      "#{base_url}#{db}"
+    else
+      "#{base_url}/#{db}"
     end
   end
 end

data/lib/bellbro/redis_pool.rb

@@ -15,15 +15,14 @@ module Bellbro
 
         def with_connection
           retryable(sleep: 0.5) do
-            Bellbro::Settings.redis_pool.with do |c|
-              c.select(model_db)
+            model_pool.with do |c|
               yield c
             end
           end
         end
 
-        def model_db
-          @model_db ||= Bellbro::Settings.redis_databases[@default_db_name]
+        def model_pool
+          @model_pool ||= Bellbro::Settings.redis_pool[@default_db_name]
         end
       end
 

data/lib/bellbro/settings.rb

@@ -2,7 +2,7 @@ module Bellbro
   module Settings
 
     class SettingsData < Struct.new(
-        :logger, :env, :redis_databases, :redis_pool_size, :redis_url, :redis_pool
+        :logger, :env, :redis_config, :redis_pool
     )
     end
 
@@ -26,26 +26,12 @@ module Bellbro
 
     def self.redis_pool
       return unless configured?
-      configuration.redis_pool ||= begin
-         ConnectionPool.new(timeout: 5, size: redis_pool_size) do
-           Redis.new(url: redis_url, network_timeout: 5)
-         end
-      end
+      configuration.redis_pool
     end
 
-    def self.redis_databases
+    def self.redis_config
       return unless configured?
-      configuration.redis_databases
-    end
-
-    def self.redis_pool_size
-      return unless configured?
-      configuration.redis_pool_size
-    end
-
-    def self.redis_url
-      return unless configured?
-      configuration.redis_url
+      configuration.redis_config
     end
 
     def self.logger

data/lib/bellbro/version.rb

@@ -1,3 +1,3 @@
 module Bellbro
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bellbro
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jon Stokes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement