run_rabbit_run 0.0.5 → 0.0.6

data/README.md

@@ -96,7 +96,7 @@ subscribe(test_queue) do | header, data |
 end
 ```
 
-Sometimes we need to have workers which does something and shuts down. For example send some messages and end the process. It is possible if you set `processes` to **zero** for the worker in config file and run `stop` command at the end of the worker script file. If the `processes` count is set to number bigger than **0** then master will run the process again after it finishes. 
+Sometimes we need to have workers which does something and shuts down. For example send some messages and end the process. It is possible if you set `processes` to **0** for the worker in config file. If the `processes` count is set to number bigger than **0** then master will run the process again after it finishes. 
 
 __config/rrr.rb__
 
@@ -111,8 +111,6 @@ __workers/worker_name_1.rb__
 test_queue = channel.queue('test_queue', auto_delete: false)
 
 publish(test_queue, {some: 'data'})
-
-stop
 ```
 
 ## Contributing

data/lib/run_rabbit_run/config.rb

@@ -17,6 +17,8 @@ module RunRabbitRun
       load_from_file "#{application_path}/config/rrr.rb"
       load_from_file "#{application_path}/config/rrr/#{@options[:environment]}.rb"
 
+      check_run_statement
+
       options
     end
 
@@ -41,7 +43,7 @@ module RunRabbitRun
     end
 
     def run *workers
-      options[:run] = workers 
+      options[:run] = workers
     end
 
   private
@@ -50,5 +52,12 @@ module RunRabbitRun
       instance_eval File.read(path), path
     end
 
+    def check_run_statement
+      diff = options[:run] - options[:workers].keys
+      if diff.size > 0
+        raise "Configuration error, run statement contains not definded worker name [#{diff.join(',')}]"
+      end
+    end
+
   end
 end

data/lib/run_rabbit_run/config/worker.rb

@@ -2,11 +2,11 @@ module RunRabbitRun
   module Config
     class Worker
       attr_accessor :options
-      
+
       def initialize(path, options = {})
         @options = {
           path:          File.expand_path(path),
-          log_to_master: true,
+          log_to_master: false,
           processes:     1,
         }.merge(options)
 
@@ -18,7 +18,7 @@ module RunRabbitRun
       def options
         @options ||= {}
       end
-     
+
       def name value
         options[:name] = value
       end

data/lib/run_rabbit_run/master.rb

@@ -20,23 +20,6 @@ module RunRabbitRun
     def start
       master_process.start do
         workers = RunRabbitRun::Workers.new
-        workers.start
-
-        add_periodic_timer 5 do
-          begin
-            workers.check unless exiting? || starting?
-          rescue => e
-            RunRabbitRun.logger.error e.message
-          end
-        end
-
-        before_exit do
-          workers.stop
-        end
-
-        before_reload do
-          workers.reload
-        end
 
         on_system_message_received do | from, message, data |
           begin
@@ -55,6 +38,24 @@ module RunRabbitRun
           end
         end
 
+        workers.start
+
+        add_periodic_timer 5 do
+          begin
+            workers.check unless exiting? || starting?
+          rescue => e
+            RunRabbitRun.logger.error e.message
+          end
+        end
+
+        before_exit do
+          workers.stop
+        end
+
+        before_reload do
+          workers.reload
+        end
+
       end
 
       Pid.save(master_process.pid)

data/lib/run_rabbit_run/processes/base.rb

@@ -31,7 +31,6 @@ module RunRabbitRun
           Signal.trap(RunRabbitRun::SIGNAL_RELOAD) { signals << RunRabbitRun::SIGNAL_RELOAD }
 
           EventMachine.run do
-
             instance_exec &block
 
             EventMachine::add_periodic_timer( 0.5 ) do

data/lib/run_rabbit_run/processes/master.rb

@@ -13,8 +13,6 @@ module RunRabbitRun
 
       def start &block
         super do
-          instance_exec &block
-
           rabbitmq = RunRabbitRun::Rabbitmq::Base.new
           system_messages = RunRabbitRun::Rabbitmq::SystemMessages.new(rabbitmq)
 
@@ -25,6 +23,11 @@ module RunRabbitRun
           before_exit do
             rabbitmq.stop
           end
+
+          add_timer 1 do
+            instance_exec &block
+          end
+
         end
       end
     end

data/lib/run_rabbit_run/processes/worker.rb

@@ -19,20 +19,43 @@ module RunRabbitRun
 
           system_messages.publish(@name, :master, :process_started, { pid: Process.pid } )
 
-          rabbitmq.on_message_received do | queue |
-            system_messages.publish(@name, :master, :message_received, { queue: queue.name } ) if @options[:log_to_master]
-          end
-          rabbitmq.on_message_processed do | queue |
-            system_messages.publish(@name, :master, :message_processed, { queue: queue.name } ) if @options[:log_to_master]
-          end 
+          if @options[:processes] == 0
+            add_timer 1 do
+              rabbitmq.instance_eval File.read(@options[:path]), @options[:path]
 
-          add_timer 1 do
-            rabbitmq.instance_eval File.read(@options[:path]), @options[:path]
-          end
+              system_messages.publish(@name, :master, :process_quit)
+              rabbitmq.stop
+            end
+          else
+
+            rabbitmq.on_message_received do | queue |
+              system_messages.publish(@name, :master, :message_received, { queue: queue.name } ) if @options[:log_to_master]
+            end
+            rabbitmq.on_message_processed do | queue |
+              system_messages.publish(@name, :master, :message_processed, { queue: queue.name } ) if @options[:log_to_master]
+            end
+            rabbitmq.on_error do | queue, e |
+              RunRabbitRun.logger.error "[#{@name}] #{e.message} \n#{e.backtrace.join("\n")}"
+              #system_messages.publish( @name, :master, :error,
+              #  {
+              #    queue: queue.name,
+              #    exception: { message: e.message, backtrace: e.backtrace }
+              #  }
+              #) if @options[:log_to_master]
+            end
+
+            add_timer 1 do
+              begin
+                rabbitmq.instance_eval File.read(@options[:path]), @options[:path]
+              rescue => e
+                RunRabbitRun.logger.error "[#{@name}] #{e.message} \n#{e.backtrace.join("\n")}"
+              end
+            end
 
-          before_exit do
-            system_messages.publish(@name, :master, :process_quit)
-            rabbitmq.stop
+            before_exit do
+              system_messages.publish(@name, :master, :process_quit)
+              rabbitmq.stop
+            end
           end
         end
       end

data/lib/run_rabbit_run/rabbitmq.rb

@@ -7,6 +7,7 @@ module RunRabbitRun
 
       define_callback :on_message_received
       define_callback :on_message_processed
+      define_callback :on_error
 
       def subscribe(queue, options = {}, &block)
         opts = options.dup
@@ -16,7 +17,11 @@ module RunRabbitRun
           RunRabbitRun.logger.info "[#{queue.name}] [#{Time.now.to_f}] started" if time_logging
           call_callback :on_message_received, queue
 
-          instance_exec(header, JSON.parse(payload), &block)
+          begin
+            instance_exec(header, JSON.parse(payload), &block)
+          rescue => e
+            call_callback :on_error, queue, e
+          end
 
           call_callback :on_message_processed, queue
           RunRabbitRun.logger.info "[#{queue.name}] [#{Time.now.to_f}] finished" if time_logging
@@ -24,7 +29,22 @@ module RunRabbitRun
       end
 
       def publish(queue, data)
-        exchange.publish JSON.generate(data), :routing_key => queue.name
+        exchange.publish JSON.generate(data), routing_key: queue.name
+      end
+
+      def publish_sync(queue, data)
+        bunny.exchange('').publish(JSON.generate(data), key: queue.name)
+      end
+
+      def bunny
+        @bunny ||= begin
+          require 'bunny'
+
+          bunny = Bunny.new
+          bunny.start
+
+          bunny
+        end
       end
 
       def connection
@@ -40,6 +60,8 @@ module RunRabbitRun
       end
 
       def stop
+        bunny.stop if @bunny
+
         connection.close {
           EventMachine.stop { exit }
         }

data/lib/run_rabbit_run/rabbitmq/system_messages.rb

@@ -2,18 +2,21 @@ module RunRabbitRun
   module Rabbitmq
     class SystemMessages
       def initialize(rabbitmq)
-        @rabbitmq = rabbitmq
+        @rabbitmq        = rabbitmq
+        @system_queue    = @rabbitmq.channel.queue("profile.#{RunRabbitRun.config[:environment]}", durable: true, auto_delete: false)
+        @system_exchange = @rabbitmq.channel.topic("runrabbitrun.system", durable: true)
       end
 
       def subscribe routing_key, &block
-        system_queue.bind(system_exchange, routing_key: "profile.#{RunRabbitRun.config[:environment]}.#{routing_key}")
-        system_queue.subscribe do | headers, payload |
+        @system_queue.
+            bind(@system_exchange, routing_key: "profile.#{RunRabbitRun.config[:environment]}.#{routing_key}").
+            subscribe do | headers, payload |
           block.call(headers, JSON.parse(payload))
         end
       end
 
       def publish from, target, message, data = {}
-        system_exchange.publish(
+        @system_exchange.publish(
           JSON.generate({
             from: from,
             message: message,
@@ -22,16 +25,6 @@ module RunRabbitRun
           routing_key: "profile.#{RunRabbitRun.config[:environment]}.#{target}")
       end
 
-    private
-
-      def system_queue
-        @system_queue ||= @rabbitmq.channel.queue("profile.#{RunRabbitRun.config[:environment]}", auto_delete: false)
-      end
-
-      def system_exchange
-        @system_exchange ||= @rabbitmq.channel.topic("runrabbitrun.system", durable: true)
-      end
-
     end
   end
 end

data/lib/run_rabbit_run/version.rb

@@ -1,3 +1,3 @@
 module RunRabbitRun
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/run_rabbit_run.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rake"
   gem.add_dependency "bson_ext"
   gem.add_dependency "amqp"
+  gem.add_dependency "bunny"
 
   gem.add_development_dependency 'pry'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: run_rabbit_run
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement