sad 1.5.15 → 1.5.16

Sign up to get free protection for your applications and to get access to all the features.
data/README.md CHANGED
@@ -146,10 +146,6 @@ level的取值如下:
146
146
  * FATAL = 4
147
147
  * UNKNOWN = 5
148
148
 
149
- ## 注意事项
150
-
151
- * 本库使用的redis是em-hiredis,和redis库冲突,同一个项目不能同时引用
152
-
153
149
  ## Contributing to sad
154
150
 
155
151
  * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.5.15
1
+ 1.5.16
data/lib/sad/logger.rb CHANGED
@@ -21,17 +21,21 @@ module Sad
21
21
  :path => STDOUT,
22
22
  :level => 1
23
23
  }.update opts.dup
24
-
25
- reopen
24
+ init_log
26
25
  end
27
26
 
28
27
  def reopen
29
- @logger = ::Logger.new(@opts[:path])
30
- @logger.level = @opts[:level]
31
- @logger.formatter = ::Logger::Formatter.new
28
+ @logger = init_log
32
29
  reset_loggers(@logger)
33
30
  end
34
31
 
32
+ def init_log
33
+ logger = ::Logger.new(@opts[:path])
34
+ logger.level = @opts[:level]
35
+ logger.formatter = ::Logger::Formatter.new
36
+ logger
37
+ end
38
+
35
39
  def reset_loggers(logger)
36
40
  if defined?(ActiveRecord)
37
41
  ActiveRecord::Base.logger = logger
data/lib/sad/runner.rb CHANGED
@@ -24,8 +24,9 @@ module Sad
24
24
  Daemons.run_proc("Sad-#{Sad::Config.queue(ENV['QUEUE'])}-#{t+1}", opts) do
25
25
  self.require_libs
26
26
  self.show_info
27
+ ::Sad.logger.reopen
27
28
  EM.run{
28
- Sad.logger.reopen
29
+ Sad::Config.redis.send(:reconnect)
29
30
  Sad::Server.run(ENV['QUEUE'])
30
31
  }
31
32
  end
data/sad.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "sad"
8
- s.version = "1.5.15"
8
+ s.version = "1.5.16"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["\u{5d14}\u{5ce5}"]
12
- s.date = "2013-07-30"
12
+ s.date = "2013-08-02"
13
13
  s.description = "a simple em baseed background job worker."
14
14
  s.email = "zheng.cuizh@gmail.com"
15
15
  s.extra_rdoc_files = [
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sad
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.15
4
+ version: 1.5.16
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-07-30 00:00:00.000000000 Z
12
+ date: 2013-08-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: jeweler
@@ -203,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
203
203
  version: '0'
204
204
  segments:
205
205
  - 0
206
- hash: -2176915248707527757
206
+ hash: 4127993505939042421
207
207
  required_rubygems_version: !ruby/object:Gem::Requirement
208
208
  none: false
209
209
  requirements: