ar_mysql_flexmaster 0.4.0 → 0.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,13 @@
1
1
  rvm:
2
2
  - 1.9.3
3
+ - 2.0
3
4
  gemfile:
4
5
  - gemfiles/rails2.gemfile
5
6
  - gemfiles/rails3.gemfile
6
7
  - gemfiles/rails3.2.gemfile
8
+ matrix:
9
+ exclude:
10
+ - rvm: 2.0
11
+ gemfile: gemfiles/rails2.gemfile
12
+ - rvm: 2.0
13
+ gemfile: gemfiles/rails3.gemfile
data/Rakefile CHANGED
@@ -2,9 +2,7 @@
2
2
  require 'rake/testtask'
3
3
 
4
4
  require 'appraisal'
5
- require 'yaggy'
6
-
7
- Yaggy.gem(File.expand_path("ar_mysql_flexmaster.gemspec", File.dirname(__FILE__)), :push_gem => true)
5
+ require 'bump/tasks'
8
6
 
9
7
  Rake::TestTask.new(:test_units) do |test|
10
8
  test.libs << 'lib' << 'test'
@@ -12,12 +12,12 @@ Gem::Specification.new do |gem|
12
12
  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
13
13
  gem.name = "ar_mysql_flexmaster"
14
14
  gem.require_paths = ["lib"]
15
- gem.version = "0.4.0"
15
+ gem.version = "0.4.1"
16
16
 
17
17
  gem.add_runtime_dependency("mysql2")
18
18
  gem.add_runtime_dependency("activerecord")
19
19
  gem.add_runtime_dependency("activesupport")
20
20
  gem.add_development_dependency("appraisal")
21
- gem.add_development_dependency("yaggy")
21
+ gem.add_development_dependency("bump")
22
22
  gem.add_development_dependency("mysql_isolated_server", "~> 0.1.1")
23
23
  end
@@ -113,13 +113,21 @@ def process_kill_thread
113
113
  next if process['Info'] =~ /SET GLOBAL READ_ONLY/
114
114
  next if process['Id'].to_i == my_id.to_i
115
115
  puts "killing #{process}"
116
- cx.query("kill #{process['Id']}")
116
+ kill_query!(cx, process['Id'])
117
117
  end
118
118
  sleep 0.1
119
119
  end
120
120
  end
121
121
  end
122
122
 
123
+ def kill_query!(cx, id)
124
+ begin
125
+ cx.query("kill #{id}")
126
+ rescue Mysql2::Error => e
127
+ raise e unless e.errno == 1094 # unknown thread id error
128
+ end
129
+ end
130
+
123
131
  def swap_thread
124
132
  Thread.new do
125
133
  master = open_cx($old_master)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ar_mysql_flexmaster
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.0
4
+ version: 0.4.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-04-25 00:00:00.000000000 Z
12
+ date: 2013-05-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: mysql2
@@ -76,7 +76,7 @@ dependencies:
76
76
  - !ruby/object:Gem::Version
77
77
  version: '0'
78
78
  - !ruby/object:Gem::Dependency
79
- name: yaggy
79
+ name: bump
80
80
  requirement: !ruby/object:Gem::Requirement
81
81
  none: false
82
82
  requirements: