ebisu_connection 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7397a17d9b203b5278468bc1f0bbea7a315d133
-  data.tar.gz: 4d5904d664ec3ec2f05e4e2d6f327b0e59f683cf
+  metadata.gz: 4d18980741ce133172b0fb8ab9bbaa1e171a1190
+  data.tar.gz: 4e44601e1a9137721c63b69be36604155b8b7e0e
 SHA512:
-  metadata.gz: 3940807ea924e4720501d3070c1a9cd51846a1f871c4923d8206770ca0435e092b2ddf3969e5210ca8c5fdb30250b215475d8c88e307950ffbff88c280b09785
-  data.tar.gz: 945d266756d44550d10bb26884d5a37978d022980757b6f9e07255c0de27a162a8d26c2674e238a5f5238bb434e6da8fa08d6a061b86f82f2afe1b10b0a96b27
+  metadata.gz: 61ce15decbf4956cb90a81ac924bc62e89758bf2c290f1a73c0684350d7cd90192d3086ea268e1a0ca8951a73b64eff15e36d0c10b72002682089c507880b1e3
+  data.tar.gz: 88d8e8e397020242d01dd69c7d386e1a0f09a1a6295f51cf2d3dbb48faeae9f64fc2af19a5d693f64421724e5956f8e0e07d1c7467502156ac83b369a877e541

data/README.md

@@ -1,4 +1,4 @@
-# EbisuConnection                                                                                                                                                                                           
+# EbisuConnection
 
 EbisuConnection supports to connect with Mysql slave servers. It doesn't need Load Balancer.
 You can assign a performance weight to each slave server. And slave config is reflected dynamic. 
@@ -45,11 +45,12 @@ Others will use the master setting. If you want to change, write in the slave.
 
 Config of each slave server fill out config/slave.yaml
 
-    - "slave1, 10"
-    - "slave2, 20"
-    -
-      host: "slave3"
-      weight: 30
+    production:
+      - "slave1, 10"
+      - "slave2, 20"
+      -
+        host: "slave3"
+        weight: 30
 
 config/slave.yaml is checked by end of action. If config changed, it's reflected dynamic. Application doesn't need restart.
 
@@ -59,17 +60,18 @@ String format is it. You can write config with hash.
 
 ### Only master models
 
-config/initializers/fresh_connection.rb
+config/initializers/ebisu_connection.rb
 
-    FreshConnection::SlaveConnection.ignore_models = %w|Model1 Model2|
+    EbisuConnection::ConnectionManager.ignore_models = %w|Model1 Model2|
 
-If models that ignore access to slave servers is exist, You can write model name at FreshConnection::SlaveConnection.ignore models.
+If models that ignore access to slave servers is exist, You can write model name at EbisuConnection::ConnectionManager.ignore models.
 
 ## Usage
 
 Read query will be access to slave server.
 
     Article.where(:id => 1)
+    Article.count
 
 If you want to access to master saver, use readonly(false).
 

data/lib/ebisu_connection.rb

@@ -1,5 +1,6 @@
 require "fresh_connection"
 require "ebisu_connection/version"
+require "ebisu_connection/conf_file"
 require "ebisu_connection/slaves"
 require "ebisu_connection/connection_manager"
 

data/lib/ebisu_connection/conf_file.rb

@@ -0,0 +1,63 @@
+module EbisuConnection
+  class ConfFile
+    class << self
+      attr_writer :slaves_file, :check_interval
+      attr_accessor :slave_type
+
+      def if_modify
+        if time_to_check? && modify?
+          yield
+        end
+      end
+
+      def conf_clear!
+        @slaves_conf = nil
+        @spec = nil
+      end
+
+      def slaves_conf
+        @slaves_conf ||= get_slaves_conf
+      end
+
+      def spec
+        @spec ||= get_spec
+      end
+
+      def slaves_file
+        @slaves_file || File.join(Rails.root, "config/slave.yaml")
+      end
+
+      def check_interval
+        @check_interval || 1.minute
+      end
+
+      private
+
+      def time_to_check?
+        now = Time.now
+        @check_time ||= now
+
+        return false if now - @check_time < check_interval
+
+        @check_time = now
+        true
+      end
+
+      def modify?
+        @file_mtime != File.mtime(slaves_file)
+      end
+
+      def get_slaves_conf
+        @file_mtime = File.mtime(slaves_file)
+        conf = YAML.load_file(slaves_file)
+        conf = conf[Rails.env.to_s] if conf.is_a?(Hash)
+        slave_type ? conf[slave_type.to_s] : conf
+      end
+
+      def get_spec
+        ret = ActiveRecord::Base.configurations[Rails.env]
+        ret.merge(ret["slave"] || {})
+      end
+    end
+  end
+end

data/lib/ebisu_connection/connection_manager.rb

@@ -2,19 +2,19 @@ require 'yaml'
 
 module EbisuConnection
   class ConnectionManager
-    CHECK_INTERVAL = 1.minute
-
     class << self
-      attr_writer :slaves_file
-      attr_accessor :slave_type
+      delegate :slave_file, :slave_file=, :check_interval, :check_interval=,
+        :slave_type, :slave_type=, :to => EbisuConnection::ConfFile
 
-      def slaves_file
-        @slaves_file || File.join(Rails.root, "config/slave.yaml")
-      end
+      delegate :ignore_models=, :to => FreshConnection::SlaveConnection
     end
 
+    delegate :if_modify, :conf_clear!, :slaves_conf, :spec,
+      :to => EbisuConnection::ConfFile
+
     def initialize
       @mutex = Mutex.new
+      @slaves = {}
     end
 
     def slave_connection
@@ -23,63 +23,51 @@ module EbisuConnection
 
     def put_aside!
       return if check_own_connection
-      return unless @file_mtime
-
-      now = Time.now
-      @check_time ||= now
-      return if now - @check_time < CHECK_INTERVAL
-      @check_time = now
 
-      mtime = File.mtime(self.class.slaves_file)
-      return if @file_mtime == mtime
-
-      reserve_release_all_connection
-      check_own_connection
+      if_modify do
+        reserve_release_all_connection
+        check_own_connection
+      end
     end
 
     def clear_all_connection!
       @mutex.synchronize do
-        @slaves ||= {}
         @slaves.values.each do |s|
           s.all_disconnect!
         end
 
-        @slaves = nil
-        @slave_conf = nil
-        @spec = nil
+        @slaves = {}
+        conf_clear!
       end
     end
 
     private
 
     def check_own_connection
-      ret = false
       @mutex.synchronize do
-        @slaves ||= {}
-        if s = @slaves[current_thread_id]
-          if ret = s.reserved_release?
-            s.all_disconnect!
-            @slaves.delete(current_thread_id)
-          end
+        s = @slaves[current_thread_id]
+
+        if s && s.reserved_release?
+          s.all_disconnect!
+          @slaves.delete(current_thread_id)
+          true
+        else
+          false
         end
       end
-      ret
     end
 
     def reserve_release_all_connection
       @mutex.synchronize do
-        @slaves ||= {}
         @slaves.values.each do |s|
           s.reserve_release_connection!
         end
-        @slave_conf = nil
-        @spec = nil
+        conf_clear!
       end
     end
 
     def slaves
       @mutex.synchronize do
-        @slaves ||= {}
         @slaves[current_thread_id] ||= get_slaves
       end
     end
@@ -88,25 +76,6 @@ module EbisuConnection
       EbisuConnection::Slaves.new(slaves_conf, spec)
     end
 
-    def slaves_conf
-      @slaves_conf ||= get_slaves_conf
-    end
-
-    def spec
-      @spec ||= get_spec
-    end
-
-    def get_slaves_conf
-      @file_mtime = File.mtime(self.class.slaves_file)
-      conf = YAML.load_file(self.class.slaves_file)
-      self.class.slave_type ? conf[self.class.slave_type] : conf
-    end
-
-    def get_spec
-      ret = ActiveRecord::Base.configurations[Rails.env]
-      ret.merge(ret["slave"] || {})
-    end
-
     def current_thread_id
       Thread.current.object_id
     end

data/lib/ebisu_connection/version.rb

@@ -1,3 +1,3 @@
 module EbisuConnection
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ebisu_connection
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - tsukasaoishi
@@ -81,6 +81,7 @@ files:
 - Rakefile
 - ebisu_connection.gemspec
 - lib/ebisu_connection.rb
+- lib/ebisu_connection/conf_file.rb
 - lib/ebisu_connection/connection_manager.rb
 - lib/ebisu_connection/slaves.rb
 - lib/ebisu_connection/version.rb