sad 1.4.0 → 1.5.0

data/Gemfile

@@ -6,5 +6,6 @@ gem 'activesupport'
 gem 'eventmachine'
 gem 'em-hiredis'
 gem 'daemons'
+gem 'logger'
 gem	"json"
 gem 'pry'

data/Gemfile.lock

@@ -18,6 +18,7 @@ GEM
       rake
       rdoc
     json (1.7.7)
+    logger (1.2.8)
     method_source (0.8.1)
     multi_json (1.7.2)
     pry (0.9.12)
@@ -39,4 +40,5 @@ DEPENDENCIES
   eventmachine
   jeweler
   json
+  logger
   pry

data/README.md

@@ -123,6 +123,24 @@ SadJob.enqueue(1,2,3,4,5){|payload|
 }
 ```
 
+## 日志logger
+
+Sad.logger是个Logger的实例，通过如下方式来配置:
+
+```ruby
+Sad.logger = {:path => 'sad.production.log', :level => 2}
+Sad.logger.error("Crashed!!!")
+```
+
+level的取值如下:
+
+* DEBUG = 0
+* INFO = 1
+* WARN = 2
+* ERROR = 3
+* FATAL = 4
+* UNKNOWN = 5
+
 ## Contributing to sad
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.5.0

data/lib/sad.rb

@@ -10,4 +10,15 @@ module Sad
 	autoload :Server, 'sad/server'
 	autoload :Worker, 'sad/worker'
 	autoload :Runner, 'sad/runner'
+	autoload :Logger, 'sad/logger'
+
+	class << self
+		def logger=(opts)
+			@_logger = ::Sad::Logger.new(opts)
+		end
+
+		def logger
+			@_logger ||= ::Sad::Logger.new
+		end
+	end
 end

data/lib/sad/logger.rb

@@ -0,0 +1,33 @@
+require "logger"
+
+module Sad
+	class Logger
+=begin
+    # Low-level information, mostly for developers
+    DEBUG = 0
+    # generic, useful information about system operation
+    INFO = 1
+    # a warning
+    WARN = 2
+    # a handleable error condition
+    ERROR = 3
+    # an unhandleable error that results in a program crash
+    FATAL = 4
+    # an unknown message that should always be logged
+    UNKNOWN = 5
+=end
+		def initialize(opts={})
+			opts = {
+				:path => STDOUT,
+				:level => 2
+			}.update opts.dup
+
+			@logger = ::Logger.new(opts[:path])
+			@logger.level = opts[:level]
+		end
+
+		def method_missing(method_name, *args, &block)
+			@logger.send(method_name, *args, &block)
+		end
+	end
+end

data/lib/sad/payload.rb

@@ -34,7 +34,7 @@ module Sad
 					self.sad_args['delay'] = ::Sad::Config.interval * self.sad_args['retry']
 					self.enqueue
 				else
-					STDERR.puts "Payload perform error for #{self.sad_args['retry']} retrys:\n#{self.inspect}"
+					logger.error "Payload perform error for #{self.sad_args['retry']} retrys:\n#{self.inspect}"
 				end
 			end
 		end

data/lib/sad/server.rb

@@ -11,14 +11,14 @@ module Sad
 				request = ::Sad::Config.redis.blpop(queue, 60)
 				request.callback{|_, data|
 					if data
-						STDOUT.puts '-'*15 + data.inspect + '-'*15
+						logger.info '-'*15 + data.inspect + '-'*15
 						payload = Payload.decode(data)
 						payload_call(payload)
 					end
 					fetch_with_interval(queue)
 				}
 				request.errback{
-					STDERR.puts 'error with redis request.'
+					logger.error "error with redis request.\n#{request.inspect}"
 					fetch_with_interval(queue)
 				}
 			end

data/sad.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sad"
-  s.version = "1.4.0"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["\u{5d14}\u{5ce5}"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/sad.rb",
     "lib/sad/config.rb",
+    "lib/sad/logger.rb",
     "lib/sad/payload.rb",
     "lib/sad/runner.rb",
     "lib/sad/server.rb",
@@ -52,6 +53,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
       s.add_runtime_dependency(%q<em-hiredis>, [">= 0"])
       s.add_runtime_dependency(%q<daemons>, [">= 0"])
+      s.add_runtime_dependency(%q<logger>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<pry>, [">= 0"])
     else
@@ -60,6 +62,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<eventmachine>, [">= 0"])
       s.add_dependency(%q<em-hiredis>, [">= 0"])
       s.add_dependency(%q<daemons>, [">= 0"])
+      s.add_dependency(%q<logger>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
     end
@@ -69,6 +72,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<eventmachine>, [">= 0"])
     s.add_dependency(%q<em-hiredis>, [">= 0"])
     s.add_dependency(%q<daemons>, [">= 0"])
+    s.add_dependency(%q<logger>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sad
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +156,7 @@ files:
 - VERSION
 - lib/sad.rb
 - lib/sad/config.rb
+- lib/sad/logger.rb
 - lib/sad/payload.rb
 - lib/sad/runner.rb
 - lib/sad/server.rb
@@ -165,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1386435798103601784
+      hash: -1782391998452226868
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: