ar_mysql_flexmaster 0.4.0 → 0.4.1

data/.travis.yml

@@ -1,6 +1,13 @@
 rvm:
   - 1.9.3
+  - 2.0
 gemfile:
   - gemfiles/rails2.gemfile
   - gemfiles/rails3.gemfile
   - gemfiles/rails3.2.gemfile
+matrix:
+  exclude:
+    - rvm: 2.0
+      gemfile: gemfiles/rails2.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails3.gemfile

data/Rakefile

@@ -2,9 +2,7 @@
 require 'rake/testtask'
 
 require 'appraisal'
-require 'yaggy'
-
-Yaggy.gem(File.expand_path("ar_mysql_flexmaster.gemspec", File.dirname(__FILE__)), :push_gem => true)
+require 'bump/tasks'
 
 Rake::TestTask.new(:test_units) do |test|
   test.libs << 'lib' << 'test'

data/ar_mysql_flexmaster.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "ar_mysql_flexmaster"
   gem.require_paths = ["lib"]
-  gem.version       = "0.4.0"
+  gem.version       = "0.4.1"
 
   gem.add_runtime_dependency("mysql2")
   gem.add_runtime_dependency("activerecord")
   gem.add_runtime_dependency("activesupport")
   gem.add_development_dependency("appraisal")
-  gem.add_development_dependency("yaggy")
+  gem.add_development_dependency("bump")
   gem.add_development_dependency("mysql_isolated_server", "~> 0.1.1")
 end

data/bin/master_cut

@@ -113,13 +113,21 @@ def process_kill_thread
         next if process['Info'] =~ /SET GLOBAL READ_ONLY/
         next if process['Id'].to_i == my_id.to_i
         puts "killing #{process}"
-        cx.query("kill #{process['Id']}") 
+        kill_query!(cx, process['Id'])
       end
       sleep 0.1
     end
   end
 end
 
+def kill_query!(cx, id)
+  begin
+    cx.query("kill #{id}") 
+  rescue Mysql2::Error => e
+    raise e unless e.errno == 1094 # unknown thread id error
+  end
+end
+
 def swap_thread
   Thread.new do 
     master = open_cx($old_master)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_mysql_flexmaster
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yaggy
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: