sweatshop 1.5.1 → 1.5.2

data/Rakefile

@@ -9,11 +9,11 @@ begin
     s.name = "sweatshop"
     s.summary = %Q{Sweatshop is a simple asynchronous worker queue build on top of rabbitmq/ampq}
     s.email = "amos@geni.com"
-    s.homepage = "http://github.com/famoseagle/sweat-shop"
+    s.homepage = "http://github.com/famoseagle/sweatshop"
     s.description = "See summary"
     s.authors = ["Amos Elliston"]
     s.files =  FileList["[A-Z]*", "install.rb", "{lib,test,config,script}/**/*"]
-    s.add_dependency('famoseagle-carrot', '= 0.7.0')
+    s.add_dependency('carrot', '= 0.7.0')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:patch: 1
-:major: 1
+:build: 
 :minor: 5
+:patch: 2
+:major: 1

data/lib/message_queue/rabbit.rb

@@ -74,6 +74,8 @@ module MessageQueue
             if i == (@opts['cluster'].size-1)
               raise e
             else
+              Sweatshop.log "\n*** Sweatshop failing over to #{@opts['cluster'][i+1]} ***"
+              Sweatshop.log "Error: #{e.message}\n#{e.backtrace.join("\n")}"
               next
             end
           end

data/lib/sweatshop/sweatd.rb

@@ -34,11 +34,14 @@ module Sweatshop
     end
 
     sig(:hup) do
-      puts "Received HUP"
-      Sweatshop.stop
-      remove_pid!
-      puts "Restarting sweatd with #{start_cmd}..."
-      `#{start_cmd}`        
+      begin
+        puts "Received HUP"
+        Sweatshop.stop
+      ensure
+        remove_pid!
+        puts "Restarting sweatd with #{start_cmd}..."
+        `#{start_cmd}`        
+      end
     end
     
     before do
@@ -52,6 +55,8 @@ module Sweatshop
     daemonize(:kill_timeout => 20) do
       workers = []
 
+      Sweatshop.daemonize
+
       if groups.any?
         workers += Sweatshop.workers_in_group(groups)
       end

data/lib/sweatshop/worker.rb

@@ -85,8 +85,12 @@ module Sweatshop
       end
     end
 
+    def self.queue=(queue)
+      @queue = queue
+    end
+
     def self.queue
-      Sweatshop.queue(queue_group.to_s)
+      @queue ||= Sweatshop.queue(queue_group.to_s)
     end
 
     def self.workers

data/lib/sweatshop.rb

@@ -79,6 +79,14 @@ module Sweatshop
     end
   end
 
+  def daemon?
+    @daemon
+  end
+
+  def daemonize
+    @daemon = true
+  end
+
   def stop
     @stop = true
   end
@@ -114,7 +122,7 @@ module Sweatshop
   end
 
   def queue_groups
-    @queue_groups ||= workers.collect{|w| w.queue_group} << 'default'
+    @queue_groups ||= (workers.collect{|w| w.queue_group.to_s} << 'default').uniq
   end
 
   def pp_sizes
@@ -132,18 +140,18 @@ module Sweatshop
       next unless qconfig['cluster']
       servers << qconfig['cluster']
     end
-    servers.flatten!
+    servers = servers.flatten.uniq
 
     servers.each do |server|
       puts "\nQueue sizes on #{server}"
       queue = MessageQueue::Rabbit.new('host' => server)
-      queue_groups.each do |group|
-        queues[group] = queue
+      workers.each do |worker|
+        worker.queue = queue
       end
       pp_sizes
       puts
     end
-    @queues = {}
+    workers.each{|w| w.queue = nil}
     nil
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sweatshop
 version: !ruby/object:Gem::Version 
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors: 
 - Amos Elliston
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-26 00:00:00 -07:00
+date: 2010-01-03 00:00:00 -08:00
 default_executable: sweatd
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: famoseagle-carrot
+  name: carrot
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -57,7 +57,7 @@ files:
 - test/test_helper.rb
 - test/test_sweatshop.rb
 has_rdoc: true
-homepage: http://github.com/famoseagle/sweat-shop
+homepage: http://github.com/famoseagle/sweatshop
 licenses: []
 
 post_install_message: