rabbit_jobs 0.1.1 → 0.1.2

data/lib/rabbit_jobs/publisher.rb

@@ -16,17 +16,20 @@ module RabbitJobs
     end
 
     def publish_to(routing_key, klass, *params)
-      raise ArgumentError unless klass && routing_key && klass.is_a?(Class) && (routing_key.is_a?(Symbol) || routing_key.is_a?(String))
-
-      job = klass.new(*params)
-      job.opts = {'created_at' => Time.now.to_i}
+      raise ArgumentError unless klass && (klass.is_a?(Class) || klass.is_a?(String))
+      raise ArgumentError unless routing_key && (routing_key.is_a?(Symbol) || routing_key.is_a?(String))
 
       exchange = bunny.exchange(RJ.config[:exchange], RJ.config[:exchange_params])
       queue = bunny.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key.to_s])
       queue.bind(exchange)
 
-      exchange.publish(job.payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({key: routing_key.to_s}))
-      # b.stop
+      payload = {
+        'class' => klass.to_s,
+        'opts' => {'created_at' => Time.now.to_i},
+        'params' => params
+        }.to_json
+
+      exchange.publish(payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({key: routing_key.to_s}))
     end
 
     def purge_queue(*routing_keys)
@@ -38,7 +41,6 @@ module RabbitJobs
         messages_count += queue.status[:message_count]
         queue.purge
       end
-      # b.stop
       return messages_count
     end
 

data/lib/rabbit_jobs/scheduler.rb

@@ -64,8 +64,8 @@ module RabbitJobs
       params = args.is_a?(Hash) ? [args] : Array(args)
       queue = config['queue'] || config[:queue] || RabbitJobs.config.routing_keys.first
 
-      RJ.logger.info "publishing #{config}"
-      RabbitJobs.publish_to(queue, klass_name.constantize, nil, *params)
+      RJ.logger.info "publishing #{config} at #{Time.now}"
+      RabbitJobs.publish_to(queue, klass_name, *params)
     rescue
       RJ.logger.warn "Failed to publish #{klass_name}:\n #{$!}\n params = #{params.inspect}"
     end

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,3 @@
 module RabbitJobs
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/rabbit_jobs/worker.rb

@@ -43,7 +43,10 @@ module RabbitJobs
 
             connection.close {
               File.delete(self.pidfile) if self.pidfile
-              EM.stop { exit! }
+              EM.stop {
+                exit!
+                RJ.logger.close
+              }
             }
           end
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70149529326900 !ruby/object:Gem::Requirement
+  requirement: &70147448525540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70149529326900
+  version_requirements: *70147448525540
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &70149529326400 !ruby/object:Gem::Requirement
+  requirement: &70147448525040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70149529326400
+  version_requirements: *70147448525040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70149529326020 !ruby/object:Gem::Requirement
+  requirement: &70147448524660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149529326020
+  version_requirements: *70147448524660
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &70149529325480 !ruby/object:Gem::Requirement
+  requirement: &70147448524120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149529325480
+  version_requirements: *70147448524120
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com