rock-queue 0.1.7 → 0.1.8

data/Rakefile

@@ -3,11 +3,11 @@ require 'rake/gempackagetask'
 require 'rubygems/specification'
 require 'spec/rake/spectask'
 require 'date'
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/lib'
+$LOAD_PATH.unshift 'lib'
 require 'rock-queue/tasks'
  
 GEM = "rock-queue"
-GEM_VERSION = "0.1.7"
+GEM_VERSION = "0.1.8"
 AUTHOR = "Grzegorz Kazulak"
 EMAIL = "gregorz.kazulak@gmail.com"
 HOMEPAGE = "http://github.com/grzegorzkazulak/rock-queue"
@@ -34,6 +34,8 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
  
+task :default => :test 
+ 
 desc "install the gem locally"
 task :install => [:package] do
   sh %{sudo gem install pkg/#{GEM}-#{GEM_VERSION}}
@@ -46,14 +48,12 @@ task :make_spec do
   end
 end
  
-desc "Run all examples (or a specific spec with TASK=spec/some_file.rb)"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_opts  = ["-cfs"]
-  t.spec_files = begin
-    if ENV["TASK"] 
-      ENV["TASK"].split(',').map { |task| "spec/**/#{task}_spec.rb" }
-    else
-      FileList['spec/**/*_spec.rb']
-    end
+desc "Run tests"
+task :test do
+  # Don't use the rake/testtask because it loads a new
+  # Ruby interpreter - we want to run tests with the current
+  # `rake` so our library manager still works
+  Dir['test/*_test.rb'].each do |f|
+    require f
   end
 end

data/lib/rock-queue/adapters/beanstalkd.rb

@@ -1,7 +1,7 @@
 begin
   require "beanstalk-client"
 rescue
-  puts "You need `beanstalk-client` gem to use the Beanstalkd rock-queue interface"
+  RockQueue::Base.logger.error "You need `beanstalk-client` gem to use the Beanstalkd rock-queue interface"
   exit
 end
 

data/lib/rock-queue/adapters/delayed_job.rb

@@ -1,7 +1,7 @@
 begin
   require "delayed_job"
 rescue
-  puts "You need `delayed_job` gem to use the Delayed Job rock-queue interface"
+  RockQueue::Base.logger.error "You need `delayed_job` gem to use the Delayed Job rock-queue interface"
   exit
 end
 

data/lib/rock-queue/adapters/resque.rb

@@ -1,7 +1,7 @@
 begin
   require 'resque'
 rescue
-  puts "You need `resque` gem to use the Resque rock-queue interface"
+  RockQueue::Base.logger.error "You need `resque` gem to use the Resque rock-queue interface"
   exit
 end
 

data/lib/rock-queue/config.rb

@@ -1,7 +1,7 @@
 module RockQueue
   class Config
     
-    attr_accessor :adapter, :host, :port
+    attr_accessor :adapter, :host, :port, :log
     
     # Return the instance
     def self.instance

data/lib/rock-queue/notifiers/email_notifier.rb

@@ -12,10 +12,10 @@ module RockQueue
       begin
         require 'mail'
       rescue
-        puts "You need `mail` gem to use the Email Notifier"
+        RockQueue::Base.logger.error "You need `mail` gem to use the Email Notifier"
       end
       
-      puts "Sending e-mail message: #{error.message}"
+      RockQueue::Base.logger.info "Sending e-mail message: #{error.message}"
 
       Mail.defaults do
         smtp do

data/lib/rock-queue/tasks.rb

@@ -11,15 +11,14 @@ namespace :rock_queue do
   task :work do
     worker = RockQueue::Worker.new
     worker.verbose = ENV['VERBOSE']
-    puts "=> Rock-queue worker initialized (#{worker})"
-
+    RockQueue::Base.logger.info "=> Rock-queue worker initialized (#{worker})"
     pid = fork do
       File.open(file_path, "wb") { |f| f.write(Process.pid) }
       worker.work
     end
   end
 
-
+  desc "Stop a Rock Queue worker"
   task :stop do
     fork do
       if File.exists?(file_path)
@@ -34,4 +33,4 @@ namespace :rock_queue do
       end
     end
   end
-end
+end

data/lib/rock-queue/worker.rb

@@ -5,35 +5,38 @@ module RockQueue
     
     # Initialize connection to queue server
     def initialize 
-      puts "=> Initializing..."
       config = RockQueue::Config.settings
       @queue = RockQueue::Base.new config.adapter, {
         :server => config.host, 
-        :port   => config.port
+        :port   => config.port,
+        :log    => config.log
       }      
+      RockQueue::Base.logger.info "=> Initializing..."
     end
     
     # Main worker loop where all jobs are beeing pulled of the queue. 
     # This is also a place where every job starts and ends it's lifecycle.
     def work
-      puts "=> Worker ready. Hold your horses!"
+      RockQueue::Base.logger.info "=> Worker ready. Hold your horses!"
       loop do
-        begin
-          @queue.receive do |queue|
-            if queue
+        ActiveRecord::Base.verify_active_connections!
+        @queue.receive do |queue|
+          if queue
+            begin
               # code that actually performs the action
               args = queue.args.first
-              puts "=> Processing class #{queue.object.name} with params: #{args.inspect}"
+              RockQueue::Base.logger.info "=> Processing class #{queue.object.name} with params: #{args.inspect}"
               args.empty? ? queue.object.perform : queue.object.perform(args)
+            rescue Object => e
+              # Add failed processing and retry
+              if queue.add_fail(e)
+                sleep(queue.get_sleep_time)
+                RockQueue::Base.logger.error "=> Processing fail! Retrying #{queue.fails.length}"
+                RockQueue::Base.logger.error "   Message: #{e.message}"
+                retry
+              end
             end
           end
-        rescue Object => e
-          # Add failed processing and retry
-          if queue.add_fail(e)
-            sleep(queue.get_sleep_time)
-            puts "=> Processing fail! Retrying #{queue.fails.length}"
-            retry
-          end
         end
       end
     end

data/lib/rock-queue.rb

@@ -23,26 +23,30 @@ module RockQueue
   autoload :ActiveRecordHelper,       'rock-queue/active_record_helper'
   
   attr_reader :adapter
-  
+
+
   class Base   
-    
+
     # Initializes the whole thing and makes the connection to the 
     # queueing server using selected adapter (passed as lowercased symbol)
     def initialize(adapter, *options)
       # Any better way to do this? :-)
       options = options.first
       if options.include?(:server) && options.include?(:port)
-      case adapter
-        when :beanstalkd
-          @adapter = Beanstalkd.new(options)
-        when :resque
-          @adapter = ResqueQueue.new(options)
-        when :delayed_job
-          @adapter = DelayedJob.new(options)
-      end
+        case adapter
+          when :beanstalkd
+            @adapter = Beanstalkd.new(options)
+          when :resque
+            @adapter = ResqueQueue.new(options)
+          when :delayed_job
+            @adapter = DelayedJob.new(options)
+        end
       else
         raise ArgumentError
       end
+
+      # Initialize logger
+      @@logger = Logger.new(options[:log].nil? ? STDOUT : options[:log])
     end
     
     
@@ -60,18 +64,22 @@ module RockQueue
     def receive
       if block_given?
         obj, args = @adapter.pop
-        if obj
-          yield QueueObject.new(obj, args)
-        end
+        yield QueueObject.new(obj, args) if obj
       else
         raise 'No block given'
       end
     end
     
-    
+    # Calling adapter method
     def method_missing(sym, *args, &block)
-       @adapter.send sym, *args, &block
+      @adapter.send sym, *args, &block
+    end
+
+    # Returns Rock Queue logger
+    def self.logger
+      @@logger
     end
 
   end
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Grzegorz Kazulak
@@ -14,7 +14,7 @@ autorequire: rock-queue
 bindir: bin
 cert_chain: []
 
-date: 2010-02-21 00:00:00 +01:00
+date: 2010-02-22 00:00:00 +01:00
 default_executable: 
 dependencies: []