sad 1.5.14 → 1.5.15

data/Gemfile

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

data/Gemfile.lock

@@ -28,6 +28,7 @@ GEM
     rake (10.0.4)
     rdoc (4.0.0)
       json (~> 1.4)
+    redis (3.0.3)
     slop (3.4.4)
 
 PLATFORMS
@@ -42,3 +43,4 @@ DEPENDENCIES
   json
   logger
   pry
+  redis

data/README.md

@@ -14,6 +14,11 @@ class SadJob
 		'MySadJob'
 	end
 
+	# optional
+	def	self.redis
+		# support: em-hiredis, redis, redis-namespace
+	end
+
 	def self.perform(*args)
 		puts "I'm in sad job perform method."
 		puts args

data/VERSION

@@ -1 +1 @@
-1.5.14
+1.5.15

data/lib/sad.rb

@@ -1,6 +1,6 @@
 $:.unshift File.join(File.dirname(__FILE__), '.')
 
-require "active_support"
+require "active_support/core_ext"
 require "eventmachine"
 require "em-hiredis"
 
@@ -28,7 +28,3 @@ module Sad
 		end
 	end
 end
-
-# EM.error_handler{
-# 	::Sad.logger.fatal("exception hit eventmachine!!!\n#{$!.inspect}")
-# }

data/lib/sad/config.rb

@@ -21,8 +21,8 @@ module Sad
 				@_redis ||= EM::Hiredis.connect(@_redis_url)
 			end
 
-			def interval=(int)
-				@_interval = int.to_i
+			def interval=(float)
+				@_interval = float.to_f
 			end
 
 			def interval

data/lib/sad/payload.rb

@@ -2,7 +2,7 @@ require "json"
 
 module Sad
 	class Payload
-		attr_accessor :klass, :args, :sad_args
+		attr_accessor :klass, :args, :sad_args, :redis
 
 		def initialize(klass, args = [], sad_args = {})
 			@klass = klass
@@ -11,6 +11,7 @@ module Sad
 				'retry' => 0,
 				'delay' => 0
 			}.update(sad_args)
+			self.redis ||= ::Sad::Config.redis
 		end
 
 		def encode
@@ -29,6 +30,7 @@ module Sad
 			begin
 				@klass.constantize.send :perform, *@args
 			rescue Exception => e
+				::Sad.logger.error "Payload perform error:\n#{e.to_s}\n#{e.backtrace.join($/)}"
 				if self.sad_args['retry'] and (self.sad_args['retry'].to_i < ::Sad::Config.max_retry)
 					self.sad_args['retry'] = self.sad_args['retry'].to_i + 1
 					self.sad_args['delay'] = ::Sad::Config.interval * self.sad_args['retry']
@@ -40,11 +42,25 @@ module Sad
 		end
 
 		def enqueue(&blk)
-			::Sad::Config.redis.rpush(self.sad_args['queue'], self.encode) do |value|
+			self.wrap_redis_rpush(self.sad_args['queue'], self.encode) do |value|
 				blk.call(value) if blk
 			end
 		end
 
+		def wrap_redis_rpush(queue, data, &blk)
+			case self.redis.class.to_s
+			when "EM::Hiredis::Client", "EventMachine::Hiredis::Client"
+				self.redis.rpush(queue, data) do |value|
+					blk.call(value)
+				end
+			when "Redis", "Redis::Namespace"
+				self.redis.rpush(queue, data)
+				blk.call(data)
+			else
+				raise RuntimeError, "No redis client support!\nself.redis => #{self.redis.to_s}\n#{self.inspect}"
+			end
+		end
+
 		def self.decode(json)
 			h = JSON.parse(json)
 			if h['sad_args'] or h['sad_args'] != ''

data/lib/sad/runner.rb

@@ -22,6 +22,8 @@ module Sad
 			if count and count != 0
 				count.times do |t|
 					Daemons.run_proc("Sad-#{Sad::Config.queue(ENV['QUEUE'])}-#{t+1}", opts) do
+						self.require_libs
+						self.show_info
 						EM.run{
 							Sad.logger.reopen
 							Sad::Server.run(ENV['QUEUE'])
@@ -30,5 +32,20 @@ module Sad
 				end
 			end
 		end
+
+		def self.show_info
+			p "Interval:#{::Sad::Config.interval}"
+		end
+
+		def self.require_libs
+			if ENV['LIBS']
+				p "Require libs:"
+				ENV['LIBS'].split(',').each do |f|
+					file = File.join(ENV['SAD_OLD_ROOT'], f)
+					p("===LIBS: #{file}")
+					require file
+				end
+			end
+		end
 	end
 end

data/lib/sad/tasks.rb

@@ -3,9 +3,10 @@ namespace :sad do
 		if defined?(Rails)
 			Rake::Task["environment"].invoke
 		end
+		ENV['SAD_OLD_ROOT'] = Dir.pwd
 	end
 
-	desc "start sad with args - COUNT=4 QUEUE=sosad DIR=./tmp/pids"
+	desc "start sad with args - COUNT=4 QUEUE=sosad DIR=./tmp/pids LIBS=lib/a.rb,ext/b.so"
 	task :start => [ :setup ] do
 		ENV['COUNT'] = '1' unless ENV['COUNT']
 		opts = {
@@ -18,7 +19,7 @@ namespace :sad do
 		Sad::Runner.exec(opts)
 	end
 
-	desc "stop sad with args - COUNT=4 QUEUE=sosad DIR=./tmp/pids"
+	desc "stop sad with args - COUNT=4 QUEUE=sosad DIR=./tmp/pids LIBS=lib/a.rb,ext/b.so"
 	task :stop => [ :setup ] do
 		ENV['COUNT'] = '1' unless ENV['COUNT']
 		opts = {
@@ -31,7 +32,7 @@ namespace :sad do
 		Sad::Runner.exec(opts)
 	end
 
-	desc "restart sad with args - COUNT=4 QUEUE=sosad DIR=./tmp/pids"
+	desc "restart sad with args - COUNT=4 QUEUE=sosad DIR=./tmp/pids LIBS=lib/a.rb,ext/b.so"
 	task :restart => [ :setup ] do
 		ENV['COUNT'] = '1' unless ENV['COUNT']
 		opts = {
@@ -44,7 +45,7 @@ namespace :sad do
 		Sad::Runner.exec(opts)
 	end
 
-    desc "ontop sad with args - QUEUE=sosad DIR=./tmp/pids"
+    desc "ontop sad with args - QUEUE=sosad DIR=./tmp/pids LIBS=lib/a.rb,ext/b.so"
     task :ontop => [ :setup ] do
 		ENV['COUNT'] = '1'
         opts = {

data/lib/sad/worker.rb

@@ -12,6 +12,7 @@ module Sad
 		def enqueue(*args)
 			payload = ::Sad::Payload.new(self.to_s, args)
 			payload.sad_args['queue'] = queue_name
+			payload.redis = self.redis if self.respond_to?(:redis)
 			payload.enqueue do |value|
 				yield value if block_given?
 			end

data/sad.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sad"
-  s.version = "1.5.14"
+  s.version = "1.5.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["\u{5d14}\u{5ce5}"]
-  s.date = "2013-07-18"
+  s.date = "2013-07-30"
   s.description = "a simple em baseed background job worker."
   s.email = "zheng.cuizh@gmail.com"
   s.extra_rdoc_files = [
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
     "test/test_logger_write_closed_file.rb",
     "test/test_perform_with_exception.rb",
     "test/test_redis.rb",
+    "test/test_redis_in_job.rb",
     "test/test_sad.rb"
   ]
   s.homepage = "http://github.com/charlescui/sad"
@@ -58,6 +59,7 @@ Gem::Specification.new do |s|
       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<redis>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<pry>, [">= 0"])
     else
@@ -67,6 +69,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<em-hiredis>, [">= 0"])
       s.add_dependency(%q<daemons>, [">= 0"])
       s.add_dependency(%q<logger>, [">= 0"])
+      s.add_dependency(%q<redis>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
     end
@@ -77,6 +80,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<em-hiredis>, [">= 0"])
     s.add_dependency(%q<daemons>, [">= 0"])
     s.add_dependency(%q<logger>, [">= 0"])
+    s.add_dependency(%q<redis>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])
   end

data/test/helper.rb

@@ -11,3 +11,23 @@ end
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'sad'
+require "redis"
+
+$redis = Redis.new
+
+class SadJob
+	extend ::Sad::Worker
+	
+	def self.queue
+		'MySadJob'
+	end
+
+	def self.redis
+		$redis
+	end
+
+	def self.perform(*args)
+		::Sad.logger.info("Enqueue with self.redis.")
+	end
+end
+::Sad::Config.interval = 0.1

data/test/test_perform_with_exception.rb

@@ -1,18 +1,6 @@
 $:.unshift(File.dirname __FILE__)
 require 'helper'
 
-class SadJob
-	extend ::Sad::Worker
-	
-	def self.queue
-		'MySadJob'
-	end
-
-	def self.perform(*args)
-		raise RuntimeError, 'Error for test!!!!'
-	end
-end
-
 EM.run {
 	EM::PeriodicTimer.new(3){
 		SadJob.enqueue('this is some args', {:hello => 'code'})	

data/test/test_redis_in_job.rb

@@ -0,0 +1,8 @@
+$:.unshift(File.dirname __FILE__)
+require 'helper'
+
+EM.run {
+	EM::PeriodicTimer.new(3){
+		SadJob.enqueue('this is some args', {:hello => 'code'})	
+	}
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sad
 version: !ruby/object:Gem::Version
-  version: 1.5.14
+  version: 1.5.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  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
@@ -170,6 +186,7 @@ files:
 - test/test_logger_write_closed_file.rb
 - test/test_perform_with_exception.rb
 - test/test_redis.rb
+- test/test_redis_in_job.rb
 - test/test_sad.rb
 homepage: http://github.com/charlescui/sad
 licenses:
@@ -186,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4473646825682193399
+      hash: -2176915248707527757
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: