From 522740079f60af86c05750bd826e224b04355a86 Mon Sep 17 00:00:00 2001
From: Pavel Lazureykis <lazureykis@gmail.com>
Date: Fri, 4 May 2012 18:01:25 +0400
Subject: [PATCH] rake tasks refactoring

---
 lib/rabbit_jobs/tasks.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/rabbit_jobs/tasks.rb b/lib/rabbit_jobs/tasks.rb
index 7a73ee5..301ea8c 100644
--- a/lib/rabbit_jobs/tasks.rb
+++ b/lib/rabbit_jobs/tasks.rb
@@ -14,10 +14,8 @@ def initialize_rj_daemon(daemon)
     daemon
   end
 
-  task :setup
-
   desc "Start a Rabbit Jobs worker"
-  task :worker => [ :preload, :setup ] do
+  task :worker => :environment do
     require 'rabbit_jobs'
 
     queues = (ENV['QUEUES'] || ENV['QUEUE']).to_s.split(',')
@@ -27,14 +25,14 @@ def initialize_rj_daemon(daemon)
   end
 
   desc "Start a Rabbit Jobs scheduler"
-  task :scheduler => [ :preload, :setup ] do
+  task :scheduler => :environment do
     scheduler = initialize_rj_daemon(RabbitJobs::Scheduler.new)
 
     scheduler.work
   end
 
   # Preload app files if this is Rails
-  task :preload => :setup do
+  task :environment do
     if defined?(Rails) && Rails.respond_to?(:application)
       # Rails 3
       # Rails.application.eager_load!