miyazakiresistance 0.1.3 → 0.1.4

data/README.rdoc

@@ -5,6 +5,8 @@
 == DESCRIPTION:
 
 MiyazakiResistance is a library like ActiveRecord to use Tokyo Tyrant.
+MiyazakiResistance support Master/Slave. If Slave server down, it separates automatically.
+MiyazakiResistance support Dual Master(Active/Standby). If Active server down, Standby server become Active.
 
 == SYNOPSIS:
 
@@ -12,7 +14,7 @@ MiyazakiResistance is a library like ActiveRecord to use Tokyo Tyrant.
   class Example < MiyazakiResistance::Base
     set_server "localhost", 1975, :write
     set_server "slave", 1975, :standby
-    set_timeout 60
+    set_timeout 1
     set_column :name, :string
     set_column :age, :integer
     set_column :birthday, :date
@@ -71,25 +73,168 @@ Tokyo Tyrant
 
 == LICENSE:
 
-(The MIT License)
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
 
-Copyright (c) 2009 Tsukasa OISHI
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
 
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

data/initializers/rdb.rb

@@ -1,13 +1,38 @@
 module TokyoTyrant
   class RDB
-    attr_accessor :host, :port
+    attr_accessor :host, :port, :open_flag
 
-    def open_with_save_params(host, port = 0)
+    def set_server(host, port = 0)
       @host = host
       @port = port
-      open_without_save_params(host, port)
+    end
+
+    def open_with_save_params(host = nil, port = 0)
+      @host ||= host
+      @port ||= port
+
+      if open_without_save_params(@host, @port)
+        @open_flag = true
+      else
+        false
+      end
     end
     alias_method :open_without_save_params, :open
     alias_method :open, :open_with_save_params
+
+    def close_with_change_flag
+      if close_without_change_flag
+        @open_flag = false
+        true
+      else
+        false
+      end
+    end
+    alias_method :close_without_change_flag, :close
+    alias_method :close, :close_with_change_flag
+
+    def open?
+      @open_flag
+    end
   end
 end

data/lib/miyazaki_resistance/tokyo_connection.rb

@@ -12,7 +12,7 @@ module MiyazakiResistance
       attr_accessor :timeout_time
 
       DEFAULT = {
-        :timeout => 60,
+        :timeout => 5,
         :config => "miyazakiresistance.yml",
         :port => 1978,
         :role => :readonly
@@ -39,14 +39,14 @@ module MiyazakiResistance
         rdb = TokyoTyrant::RDBTBL.new
         logger_info "set server host : #{host} port : #{port} role : #{role}"
 
-        unless rdb.open(host.to_s, port)
-          logger_fatal "TokyoTyrantConnectError host : #{host} port : #{port} role : #{role}"
-          raise TokyoTyrantConnectError
-        end
+        rdb.set_server(host.to_s, port)
 
-        self.connection_pool[:read] << rdb
-        self.connection_pool[:write] = rdb if role.to_sym == :write
-        self.connection_pool[:standby] = rdb if role.to_sym == :standby
+        if role.to_sym == :standby
+          self.connection_pool[:standby] = rdb
+        else
+          self.connection_pool[:read] << rdb
+          self.connection_pool[:write] = rdb if role.to_sym == :write
+        end
       end
 
       def set_timeout(seconds)
@@ -60,13 +60,23 @@ module MiyazakiResistance
         self.all_columns.update(name => type)
       end
 
+      def connection(con)
+        unless con.open?
+          unless con.open
+            logger_fatal "TokyoTyrantConnectError host : #{con.host} port : #{con.port}"
+            raise TokyoTyrantConnectError
+          end
+        end
+        con
+      end
+
       def read_connection
         check_pool
-        self.connection_pool[:read].sort_by{rand}.first
+        connection(self.connection_pool[:read].sort_by{rand}.first)
       end
 
       def write_connection
-        self.connection_pool[:write]
+        connection(self.connection_pool[:write])
       end
 
       def remove_pool(rdb)
@@ -79,7 +89,6 @@ module MiyazakiResistance
           self.connection_pool[:write] = new_rdb if rdb == self.connection_pool[:write]
         else
           logger_fatal "remove pool : host #{host} port : #{port}"
-          check_pool
           fail_over if rdb == self.connection_pool[:write]
         end
         rdb.close
@@ -112,6 +121,7 @@ module MiyazakiResistance
 
         logger_fatal "master server failover"
         self.connection_pool[:write] = self.connection_pool[:standby]
+        self.connection_pool[:read] << self.connection_pool[:standby]
         self.connection_pool[:standby] = nil
       end
     end

data/lib/miyazakiresistance.rb

@@ -9,7 +9,7 @@ Dir.glob("#{File.join(File.dirname(__FILE__), "../initializers")}/*.rb").each{|p
 Dir.glob("#{File.join(File.dirname(__FILE__), "miyazaki_resistance")}/*.rb").each{|path| require path}
 
 module MiyazakiResistance
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end
 
 MiyazakiResistance::Base.class_eval do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: miyazakiresistance
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Tsukasa OISHI