mysql-pause 0.1.7 → 0.1.8

data/bin/mysql-pause

@@ -29,6 +29,8 @@ ARGV.options do |parser|
   parser.on('-n', '--threads=SIZE'     ) {|v| options[:threads]      = v.to_i }
   parser.on('-W', '--working-dir=DIR'  ) {|v| options[:working_dir]  = v      }
   parser.on('-S', '--socket=SOCK_FILE' ) {|v| options[:socket]       = v      }
+  parser.on('',   '--ping-user=USER'   ) {|v| options[:ping_user]    = v      }
+  parser.on('',   '--ping-pass=PASS'   ) {|v| options[:ping_pass]    = v      }
   parser.on('',   '--debug'            ) {    options[:debug]        = true   }
 
   help_and_exit = lambda do |v|

data/lib/mysql-pause/backend.rb

@@ -4,22 +4,43 @@ module MysqlPause
   class Backend < EM::Connection
     def initialize(proxy)
       @proxy = proxy
+      @logger = proxy.logger
     end
 
     def post_init
-      if @proxy.options[:debug]
-        @proxy.logger.debug("backend: connect")
+      if (peername = get_peername)
+        @connect_from = Socket.unpack_sockaddr_in(peername)
+      end
+
+      if @proxy and @proxy.options[:debug]
+        port, ip = @connect_from
+        @logger.debug("backend: connect from #{ip}:#{port}")
       end
     end
 
     def unbind
-      if @proxy.options[:debug]
-        @proxy.logger.debug("backend: unbind")
+      if @proxy and @proxy.options[:debug]
+        port, ip = @connect_from
+        @logger.debug("backend: unbind connection from #{ip}:#{port}")
       end
     end
 
     def receive_data(data)
-      @proxy.send_data(data)
+      if not @proxy or @proxy.error?
+        @logger.info("backend: proxy connection error: #{data.inspect}")
+        close_proxy_connection
+        close_connection_after_writing
+      else
+        @proxy.send_data(data)
+      end
+    end
+
+    private
+
+    def close_proxy_connection
+      @proxy.close_connection if @proxy
+    rescue Exception => e
+      @logger.warn("#{e.class.name}: #{e.message}")
     end
-  end
-end
+  end # Backend
+end # MysqlPause

data/lib/mysql-pause/constants.rb

@@ -1,2 +1,2 @@
 APP_NAME = 'mysql-pause'
-Version = '0.1.7'
+Version = '0.1.8'

data/lib/mysql-pause/proxy.rb

@@ -3,6 +3,7 @@ require 'mysql-pause/backend'
 require 'mysql-pause/error'
 require 'logger'
 require 'socket'
+require 'mysql2/em'
 
 module MysqlPause
   RETRY_LIMIT = 100
@@ -39,14 +40,22 @@ module MysqlPause
     end
 
     def post_init
+      if (peername = get_peername)
+        @connect_from = Socket.unpack_sockaddr_in(peername)
+      end
+
       if @options[:debug]
-        @logger.debug("proxy: connect")
+        port, ip = @connect_from
+        @logger.debug("proxy: connect from #{ip}:#{port}")
       end
     end
 
     def unbind
+      close_backend_connection
+
       if @options[:debug]
-        @logger.debug("proxy: unbind")
+        port, ip = @connect_from
+        @logger.debug("proxy: unbind connection from #{ip}:#{port}")
       end
     end
 
@@ -59,7 +68,7 @@ module MysqlPause
         end
 
         if @backend.error?
-          @logger.info("backend error: #{data.inspect}")
+          @logger.info("proxy: backend connection error: #{data.inspect}")
           close_backend_connection
 
           payload_length, sequence_id = parse_mysql_packet(data)
@@ -89,9 +98,33 @@ module MysqlPause
     end
 
     def ping(addr, port)
-      sock = TCPSocket.open(addr, port)
-      sock.close
+      mysqld_is_alive = false
+      client = nil
+
+      begin
+        client = Mysql2::EM::Client.new(:host => addr, :port => port, :username => @options[:ping_user], :password => @options[:ping_pass])
+        mysqld_is_alive = client.ping
+      rescue Exception => e
+        @logger.warn("#{e.class.name}: #{e.message}")
+        mysqld_is_alive = false
+      ensure
+        begin
+          client.close if client
+        rescue Exception => e
+          @logger.warn("#{e.class.name}: #{e.message}")
+        end
+      end
+
+      return mysqld_is_alive
     end
 
+    def connect_from
+      return @connect_from if @connect_from
+
+      peername = get_peername
+      return nil unless peername
+
+      @connect_from = Socket.unpack_sockaddr_in(peername)
+    end
   end # Proxy
 end # MysqlPause

data/lib/mysql-pause/server.rb

@@ -21,9 +21,11 @@ module MysqlPause
 
       def run
         @@control_options = {
-          :pause    => false,
-          :interval => @@options[:interval],
-          :debug    => @@options[:debug],
+          :pause        => false,
+          :interval     => @@options[:interval],
+          :debug        => @@options[:debug],
+          :ping_user    => @@options[:ping_user],
+          :ping_pass    => @@options[:ping_pass],
         }
 
         # start DRb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql-pause
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: sgwr_dts@yahoo.co.jp
 executables: