redis-stat 0.3.5 → 0.3.6

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,3 +1,3 @@
1
1
  class RedisStat
2
- VERSION = "0.3.5"
2
+ VERSION = "0.3.6"
3
3
  end
data/lib/redis-stat.rb CHANGED
@@ -36,6 +36,7 @@ class RedisStat
36
36
  @style = options[:style]
37
37
  @first_batch = true
38
38
  @server_port = options[:server_port]
39
+ @server_thr = nil
39
40
  @daemonized = options[:daemon]
40
41
  end
41
42
 
@@ -98,6 +99,10 @@ class RedisStat
98
99
  rescue Interrupt
99
100
  @os.puts
100
101
  @os.puts ansi(:yellow, :bold) { "Interrupted." }
102
+ if @server_thr
103
+ @server_thr.raise Interrupt
104
+ @server_thr.join
105
+ end
101
106
  rescue Exception => e
102
107
  @os.puts ansi(:red, :bold) { e.to_s }
103
108
  raise
@@ -113,7 +118,7 @@ private
113
118
  def start_server
114
119
  RedisStat::Server.set :port, @server_port
115
120
  RedisStat::Server.set :redis_stat, self
116
- Thread.new { RedisStat::Server.run! }
121
+ @server_thr = Thread.new { RedisStat::Server.run! }
117
122
  RedisStat::Server.wait_until_running
118
123
  trap('INT') { Thread.main.raise Interrupt }
119
124
  RedisStat::Server
data/redis-stat.gemspec CHANGED
@@ -27,7 +27,7 @@ Gem::Specification.new do |gem|
27
27
  gem.add_runtime_dependency "json", '~> 1.7.5'
28
28
 
29
29
  if RUBY_PLATFORM == 'java'
30
- gem.add_runtime_dependency "puma", '~> 1.6.3'
30
+ gem.add_runtime_dependency "puma", '~> 2.3.2'
31
31
  else
32
32
  gem.add_runtime_dependency "thin", '~> 1.5.0'
33
33
  gem.add_runtime_dependency "daemons", '~> 1.1.9'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: redis-stat
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.5
4
+ version: 0.3.6
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-03-22 00:00:00.000000000 Z
12
+ date: 2013-07-13 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: ansi