mysql-pause 0.1.4 → 0.1.5

data/README

@@ -54,6 +54,10 @@ gem install mysql-pause
   1 row in set (18.01 sec)
 
 == Extend MySQL adapter
+=== Install
+
+gem install mysql-pause-adapter-ext
+
 === Example code
 
   require 'active_record'

data/bin/mpctl

@@ -4,10 +4,28 @@ $: << File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'drb/drb'
 require 'optparse'
 require 'mysql-pause/constants'
+require 'yaml'
+
+COMMAND_NAME = File.basename(__FILE__)
 
 COMMANDS = {
-  'pause'  => true,
-  'resume' => false,
+  'pause' => lambda {|server_options|
+    server_options[:pause] = true
+  },
+  'resume' => lambda {|server_options|
+    server_options[:pause] = false
+  },
+  'status' => lambda {|server_options|
+    h = {}
+    server_options.to_hash.each {|k, v| h[k.to_s] = v }
+    puts YAML.dump(h)
+  },
+  'set-interval' => lambda {|server_options, v|
+    server_options[:interval] = v.to_i
+  },
+  'set-debug' => lambda {|server_options, v|
+    server_options[:debug] = !!(/#{Regexp.escape(v)}/i =~ 'true')
+  },
 }
 
 options = nil
@@ -19,11 +37,10 @@ ARGV.options do |parser|
     :socket => "/var/tmp/#{APP_NAME}.sock",
   }
 
-  parser.on('-i', '--inerval=N'       ) {|v| options[:interval]     = v.to_i }
-  parser.on(''  , '--socket=SOCK_FILE') {|v| options[:socket]       = v      }
+  parser.on('-S', '--socket=SOCK_FILE') {|v| options[:socket] = v }
 
   help_and_exit = lambda do |v|
-    $stderr.puts parser.help.sub(APP_NAME, "#{APP_NAME} {#{cmds.join('|')}}")
+    $stderr.puts parser.help.sub(COMMAND_NAME, "#{COMMAND_NAME} {#{cmds.join('|')}}")
     exit 1
   end
 
@@ -31,13 +48,17 @@ ARGV.options do |parser|
 
   parser.parse!
 
-  unless (ARGV.length == 0 and options.length > 1) or (ARGV.length == 1 and cmds.include?(ARGV[0]))
+  unless ARGV.length >= 1 and cmds.include?(ARGV[0])
     help_and_exit.call(true)
   end
 end # parse options
 
-cmd = ARGV[0]
 server_options = DRbObject.new_with_uri("drbunix:#{options[:socket]}")
 
-server_options[:pause] = COMMANDS[cmd] if cmd
-server_options[:interval] = options[:interval] if options[:interval]
+cmd = COMMANDS.fetch(ARGV[0])
+
+if cmd.arity > 1
+  cmd.call(server_options, ARGV[1])
+else
+  cmd.call(server_options)
+end

data/bin/mysql-pause

@@ -18,6 +18,7 @@ ARGV.options do |parser|
     :interval => 3,
     :working_dir => '/var',
     :socket => "/var/tmp/#{APP_NAME}.sock",
+    :debug => false,
   }
 
   parser.on('-a', '--addr=ADDR'        ) {|v| options[:addr]         = v      }
@@ -26,8 +27,9 @@ ARGV.options do |parser|
   parser.on('-P', '--backend-port=PORT') {|v| options[:backend_port] = v.to_i }
   parser.on('-i', '--inerval=N'        ) {|v| options[:interval]     = v.to_i }
   parser.on('-n', '--threads=SIZE'     ) {|v| options[:threads]      = v.to_i }
-  parser.on(''  , '--working-dir=DIR'  ) {|v| options[:working_dir]  = v      }
-  parser.on(''  , '--socket=SOCK_FILE' ) {|v| options[:socket]       = v      }
+  parser.on('-W', '--working-dir=DIR'  ) {|v| options[:working_dir]  = v      }
+  parser.on('-S', '--socket=SOCK_FILE' ) {|v| options[:socket]       = v      }
+  parser.on('',   '--debug'            ) {    options[:debug]        = true   }
 
   help_and_exit = lambda do |v|
     $stderr.puts parser.help.sub(APP_NAME, "#{APP_NAME} {#{daemon_commands.join('|')}}")

data/lib/mysql-pause/backend.rb

@@ -6,6 +6,18 @@ module MysqlPause
       @proxy = proxy
     end
 
+    def post_init
+      if @proxy.options[:debug]
+        @proxy.logger.debug("backend: connect")
+      end
+    end
+
+    def unbind
+      if @proxy.options[:debug]
+        @proxy.logger.debug("backend: unbind")
+      end
+    end
+
     def receive_data(data)
       @proxy.send_data(data)
     end

data/lib/mysql-pause/constants.rb

@@ -1,2 +1,2 @@
 APP_NAME = 'mysql-pause'
-Version = '0.1.4'
+Version = '0.1.5'

data/lib/mysql-pause/proxy.rb

@@ -6,6 +6,8 @@ require 'socket'
 
 module MysqlPause
   class Proxy < EM::Connection
+    attr_reader :options
+    attr_reader :logger
 
     def initialize(be_host, be_port, options)
       @options = options
@@ -23,6 +25,18 @@ module MysqlPause
       end
     end
 
+    def post_init
+      if @options[:debug]
+        @logger.debug("proxy: connect")
+      end
+    end
+
+    def unbind
+      if @options[:debug]
+        @logger.debug("proxy: unbind")
+      end
+    end
+
     def receive_data(data)
       EM.defer {
         if @options[:pause]

data/lib/mysql-pause/server.rb

@@ -23,6 +23,7 @@ module MysqlPause
         @@control_options = {
           :pause    => false,
           :interval => @@options[:interval],
+          :debug    => @@options[:debug],
         }
 
         # start DRb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql-pause
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine