bluth 0.6.1 → 0.6.7

data/CHANGES.txt

@@ -1,5 +1,31 @@
 BLUTH, CHANGES
 
+#### 0.6.7 (2011-01-08) ###############################
+
+* FIXED: -f option now works for stop-workers and stop-scheduler commands
+* ADDED: Bluth.onconnect (resolves non-default redis connection issues)
+
+
+#### 0.6.6 (2011-01-02) ###############################
+
+CHANGE: Bluth::Worker.onstart
+
+#### 0.6.5 (2011-01-02) ###############################
+
+* FIXED: The previous change required a different approach for the scheduler. 
+
+#### 0.6.4 (2011-01-02) ###############################
+
+* CHANGE: Don't save the worker until after onstart is called (b/c config info can be passed)
+
+#### 0.6.3 (2011-01-02) ###############################
+
+* CHANGE: Added :bluth prefix to Worker and Scheduler keys. 
+* CHANGE: Depends on Familia 0.6.5
+* CHANGE: Option -r for bin/bluth is now -R
+* CHANGE: Bluth.poptimeout -> Bluth.queuetimeout
+
+
 #### 0.6.1 (2010-12-31) ###############################
 
 * ADDED: Bluth.env

data/Rakefile

@@ -20,12 +20,12 @@ begin
     gem.version = "#{config[:MAJOR]}.#{config[:MINOR]}.#{config[:PATCH]}"
     gem.name = name
     gem.rubyforge_project = gem.name
-    gem.summary = "A Redis queuing system built on top of Familia"
+    gem.summary = "A Redis queuing system built on top of Familia (w/ daemons!)"
     gem.description = "A Redis queuing system built on top of Familia"
     gem.email = "delano@solutious.com"
     gem.homepage = "http://github.com/delano/bluth"
     gem.authors = ["Delano Mandelbaum"]
-    gem.add_dependency("familia",    "= 0.6.3")
+    gem.add_dependency("familia",    ">= 0.6.5")
     gem.add_dependency('sysinfo',    '>= 0.7.3')
     gem.add_dependency('annoy')
     
@@ -39,7 +39,7 @@ end
 
 
 Rake::RDocTask.new do |rdoc|
-  version = "#{config[:MAJOR]}.#{config[:MINOR]}.#{config[:PATCH]}.#{config[:BUILD]}"
+  version = "#{config[:MAJOR]}.#{config[:MINOR]}.#{config[:PATCH]}"
   rdoc.rdoc_dir = "doc"
   rdoc.title = "#{name} #{version}"
   rdoc.rdoc_files.include("README*")

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :MAJOR: 0
 :MINOR: 6
-:PATCH: 1
+:PATCH: 7

data/bin/bluth

@@ -42,10 +42,10 @@ class Bluth::CLI::Definition
     @verbose ||= 0
     @verbose += 1
   end
-  global :I, String, "Add a load path" do |v|
+  global :I, :include, String, "Add a load path" do |v|
     $LOAD_PATH << v
   end
-  global :r, String, "Require a library" do |v|
+  global :R, :require, String, "Require a library" do |v|
     $LOAD_PATH << 'lib' if File.exists? 'lib'
     begin
       require v
@@ -63,7 +63,7 @@ class Bluth::CLI::Definition
     obj.global.environment ||= 'dev'
     Bluth.env = obj.global.environment
   end
-    
+  
   #TODO: command :enqueue
   
   command :start_worker => Bluth::CLI

data/bluth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bluth}
-  s.version = "0.6.1"
+  s.version = "0.6.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delano Mandelbaum"]
-  s.date = %q{2010-12-31}
+  s.date = %q{2011-01-08}
   s.default_executable = %q{bluth}
   s.description = %q{A Redis queuing system built on top of Familia}
   s.email = %q{delano@solutious.com}
@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
      "bluth.gemspec",
      "lib/bluth.rb",
      "lib/bluth/cli.rb",
-     "lib/bluth/gob.rb",
      "lib/bluth/test_helpers.rb",
      "lib/bluth/worker.rb",
      "lib/daemonizing.rb",
@@ -43,23 +42,23 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{bluth}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A Redis queuing system built on top of Familia}
+  s.summary = %q{A Redis queuing system built on top of Familia (w/ daemons!)}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<familia>, ["= 0.6.3"])
+      s.add_runtime_dependency(%q<familia>, [">= 0.6.5"])
       s.add_runtime_dependency(%q<sysinfo>, [">= 0.7.3"])
       s.add_runtime_dependency(%q<annoy>, [">= 0"])
     else
-      s.add_dependency(%q<familia>, ["= 0.6.3"])
+      s.add_dependency(%q<familia>, [">= 0.6.5"])
       s.add_dependency(%q<sysinfo>, [">= 0.7.3"])
       s.add_dependency(%q<annoy>, [">= 0"])
     end
   else
-    s.add_dependency(%q<familia>, ["= 0.6.3"])
+    s.add_dependency(%q<familia>, [">= 0.6.5"])
     s.add_dependency(%q<sysinfo>, [">= 0.7.3"])
     s.add_dependency(%q<annoy>, [">= 0"])
   end

data/lib/bluth.rb

@@ -35,7 +35,7 @@ module Bluth
   class Shutdown < Familia::Problem; end
   @db = 0
   @env = :dev
-  @poptimeout = 60 #.seconds
+  @queuetimeout = 60 #.seconds
   @handlers = []
   @locks = []
   @sysinfo = nil
@@ -43,11 +43,29 @@ module Bluth
   @scheduler = nil 
   class << self
     attr_reader :handlers, :db, :conf, :locks
-    attr_accessor :redis, :uri, :priority, :scheduler, :poptimeout, :env
+    attr_accessor :redis, :uri, :priority, :scheduler, :queuetimeout, :env
     def sysinfo
       @sysinfo ||= SysInfo.new.freeze
       @sysinfo 
     end
+    # A block to be called before a worker starts.
+    # 
+    # e.g.
+    #      Bluth.onconnect do
+    #        config = YourProject.load_config
+    #        Familia.uri = config[:redis_uri]
+    #      end
+    #
+    # Note:
+    # this block can be called multiple times so do not
+    # put anything with side effects in here.
+    def onconnect &blk
+      @onconnect = blk unless blk.nil?
+      @onconnect
+    end
+    def connect
+      instance_eval &onconnect unless onconnect.nil?
+    end
   end
   
   def Bluth.clear_locks
@@ -98,7 +116,7 @@ module Bluth
   end
   
   # Workers use a blocking pop and will wait for up to 
-  # Bluth.poptimeout (seconds) before returnning nil. 
+  # Bluth.queuetimeout (seconds) before returnning nil. 
   # Note that the queues are still processed in order. 
   # If all queues are empty, the first one to return a
   # value is use. See: 
@@ -119,7 +137,7 @@ module Bluth
     gob = nil
     begin
       order = Bluth::Queue.entry_queues.collect(&:rediskey)
-      order << Bluth.poptimeout  # We do it this way to support Ruby 1.8
+      order << Bluth.queuetimeout  # We do it this way to support Ruby 1.8
       queue, gobid = *(Bluth::Queue.redis.send(meth, *order) || [])
       unless queue.nil?
         Familia.ld "FOUND #{gobid} id #{queue}"

data/lib/bluth/cli.rb

@@ -33,12 +33,13 @@ module Bluth
         worker.daemonize
         worker.run
       else
-        Bluth.poptimeout = 3.seconds
+        Bluth.queuetimeout = 3.seconds
         worker_class.run
       end
     end
     
     def stop_workers worker_class=Bluth::Worker
+      Bluth.connect
       worker_class.instances.each do |worker|
         kill_worker worker, worker_class
       end
@@ -46,6 +47,7 @@ module Bluth
     
     def stop_worker wid=nil,worker_class=Bluth::Worker
       wids = wid ? [wid] : @argv
+      Bluth.connect
       wids.each do |wid|
         worker = worker_class.from_redis wid
         kill_worker worker, worker_class
@@ -64,7 +66,7 @@ module Bluth
         exit 1
       else
         Familia.info "Killing #{worker.rediskey}"
-        worker.kill @global.auto
+        worker.kill @option.force
       end
     end
     

data/lib/bluth/worker.rb

@@ -27,8 +27,8 @@ module Bluth
     
     def init(h=nil, u=nil, w=nil)
       @host, @user, @wid, = h || Bluth.sysinfo.hostname, u || Bluth.sysinfo.user, w
-      @pid_file ||= "/tmp/#{self.class.prefix}-#{wid}.pid"
-      @log_file ||= "/tmp/#{self.class.prefix}-#{wid}.log"
+      @pid_file ||= "/tmp/#{name}.pid"
+      @log_file ||= "/tmp/#{name}.log"
       @success ||= 0
       @failure ||= 0
       @problem ||= 0
@@ -41,7 +41,7 @@ module Bluth
     
     # Used by daemonize as the process name (linux only)
     def name
-      "bluth-#{self.class.prefix}-#{wid}"
+      [self.class.prefix, wid].flatten.join '-'
     end
     
     #def rediskey(suffix=nil)
@@ -121,7 +121,7 @@ module Bluth
     include Familia
     include Logging
     include Daemonizable
-    prefix :worker
+    prefix [:bluth, :worker]
     index [:host, :user, :wid]
     field :host
     field :user
@@ -145,6 +145,7 @@ module Bluth
     
     def run!
       begin
+        Bluth.connect
         self.class.runblock :onstart
         find_gob
       rescue => ex
@@ -163,11 +164,12 @@ module Bluth
     def run
       begin
         @process_id = $$
-        save
-        self.class.runblock :onstart
         scheduler = Rufus::Scheduler.start_new
-        Familia.info "Setting interval: #{Worker.interval} sec (poptimeout: #{Bluth.poptimeout})"
+        Bluth.connect
+        self.class.runblock :onstart
+        Familia.info "Setting interval: #{Worker.interval} sec (queuetimeout: #{Bluth.queuetimeout})"
         Familia.reconnect_all! # Need to reconnect after daemonize
+        save
         scheduler.every Worker.interval, :blocking => true do |task|
           Familia.ld "#{$$} TICK @ #{Time.now.utc}"
           sleep rand
@@ -184,7 +186,7 @@ module Bluth
       rescue Interrupt => ex
         puts <<-EOS.gsub(/(?:^|\n)\s*/, "\n")
           Exiting...
-          (You may need to wait up to #{Bluth.poptimeout} seconds
+          (You may need to wait up to #{Bluth.queuetimeout} seconds
           for this worker to exit cleanly.)
         EOS
         # We reconnect to the queue in case we're currently
@@ -252,8 +254,6 @@ module Bluth
     end
   end
   
-  # TODO: Refactor somehow. When this is subclassed
-  # (eg BS::SchduleWorker) the self.object is not created. 
   class ScheduleWorker < Storable
     include WorkerBase
     include Familia
@@ -275,7 +275,7 @@ module Bluth
         @every
       end
     end
-    prefix :scheduler
+    prefix [:bluth, :scheduler]
     index [:host, :user, :wid]
     field :host
     field :user
@@ -291,13 +291,16 @@ module Bluth
     
     def run
       begin
-        raise Familia::Problem, "Only 1 scheduler at a time" if !ScheduleWorker.instances.empty?
         EM.run {
           @process_id = $$
           srand(Bluth.salt.to_i(16) ** @process_id)
-          ScheduleWorker.schedule = Rufus::Scheduler::EmScheduler.start_new
-          save # persist and make note the scheduler is running
+          Bluth.connect
+          Familia.info "Setting interval: #{Worker.interval} sec (queuetimeout: #{Bluth.queuetimeout})"
+          Familia.reconnect_all! # Need to reconnect after daemonize
+          raise Familia::Problem, "Only 1 scheduler at a time" if !ScheduleWorker.instances.empty?
           self.class.runblock :onstart
+          save # persist and make note the scheduler is running
+          ScheduleWorker.schedule = Rufus::Scheduler::EmScheduler.start_new
           self.class.every.each do |args|
             interval, opts, blk = *args
             Familia.ld " scheduling every #{interval}: #{opts}"

data/try/16_worker_try.rb

@@ -9,7 +9,7 @@ require 'bluth/test_helpers'
 
 ## Worker has a redis key
 @worker.rediskey
-#=> 'worker:host:user:wid:object'
+#=> 'bluth:worker:host:user:wid:object'
 
 ## Worker counts success
 @worker.success!

data/try/19_bluth_try.rb

@@ -12,8 +12,8 @@ ExampleHandler.enqueue :item => :val3
 Bluth::Queue.critical.size
 #=> 3
 
-## Can set poptimeout
-Bluth.poptimeout = 2
+## Can set queuetimeout
+Bluth.queuetimeout = 2
 #=> 2
 
 ## Bluth.shift returns first value
@@ -31,7 +31,7 @@ Bluth.poptimeout = 2
 @job3.data['item']
 #=> 'val2'
 
-## Bluth.pop returns nil after waiting for poptimeout
+## Bluth.pop returns nil after waiting for queuetimeout
 Bluth.pop
 #=> nil
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bluth
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-31 00:00:00 -05:00
+date: 2011-01-08 00:00:00 -05:00
 default_executable: bluth
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 13
         segments: 
         - 0
         - 6
-        - 3
-        version: 0.6.3
+        - 5
+        version: 0.6.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -83,7 +83,6 @@ files:
 - bluth.gemspec
 - lib/bluth.rb
 - lib/bluth/cli.rb
-- lib/bluth/gob.rb
 - lib/bluth/test_helpers.rb
 - lib/bluth/worker.rb
 - lib/daemonizing.rb
@@ -125,6 +124,6 @@ rubyforge_project: bluth
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A Redis queuing system built on top of Familia
+summary: A Redis queuing system built on top of Familia (w/ daemons!)
 test_files: []
 

data/lib/bluth/gob.rb

@@ -1 +0,0 @@
-