gorg_service 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec75b0953c9f9990359d16dd8f5d8e5819b7cf12
-  data.tar.gz: 6bf86e98e9b991b8dd180d414970bf344c4f93c9
+  metadata.gz: 2796183c085588be8c61f098ff65fa089d47160d
+  data.tar.gz: fc992e99c193dd9cfd640d4c85cbdd928b4863c8
 SHA512:
-  metadata.gz: 49fb5032efcf8ddbf5c4482c64fa424bfa73007e3cfcebb588df85b289368e9594b87159efd77426cdf8fb0a3b8dfb32b9aeac9104cb775e820892082b4ea40d
-  data.tar.gz: e97e322499febeddb448239619f067cb0fe43f52bbec964657a3e333061d5c28a9497088fb4f60fa7f21211ee3d1d3982e96f012712c06c22b7bb856f20b81c6
+  metadata.gz: 2aabf7b5ac8302b358e165660a41959c1ad126c8c413e76d1f165b8484e1c8b4b0c5af719f20362d26b303c3ca759b3e7ba17d6f0f647bafa5fd05494205839a
+  data.tar.gz: 78a4a7ee82987bd195292186b9753511f9b0ff6782814eca3404c0f5da14ce1fc15a4d71276836116b8a239246a3ffd7276a3bacd7ce2f65e2039c781015a08a

data/.gitignore

@@ -9,7 +9,8 @@
 /tmp/
 /build/
 *.gem
-/bin/worker
 /spec/gorg_service/support/conf/rabbit_mq.yml
 
-.idea
+.idea
+.byebug_history
+bin/env.rb

data/bin/console

@@ -10,5 +10,9 @@ require "gorg_service"
 # require "pry"
 # Pry.start
 
+#You can add a file bin/env.rb to set convenience environment such as configuration
+env_path=File.join(File.dirname(__FILE__),"/env.rb") 
+require env_path if File.file?(env_path)
+
 require "irb"
 IRB.start

data/bin/worker

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "gorg_service"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+#You should add a file bin/env.rb to set convenience environment such as configuration
+env_path=File.join(File.dirname(__FILE__),"/env.rb") 
+require env_path if File.file?(env_path)
+
+GorgService.new.run

data/lib/gorg_service/listener.rb

@@ -6,25 +6,21 @@ require "bunny"
 class GorgService
   class Listener
 
-    def initialize(bunny_session: nil,queue_name: "gorg_service", exchange_name: nil, message_handler_map: {default: DefaultMessageHandler}, deferred_time: 1800000, max_attempts: 48,log_routing_key:nil)
-      @queue_name=queue_name
-      @exchange_name=exchange_name
+    def initialize(bunny_session: nil, env: nil, message_handler_map: {default: DefaultMessageHandler}, max_attempts: 48,log_routing_key:nil)
       @message_handler_map=message_handler_map
-      @deferred_time=deferred_time
       @max_attempts=max_attempts
       @rmq_connection=bunny_session
       @log_routing_key=log_routing_key
-    end
 
-    def listen
+      @env=env
+    end
 
-      set_rabbitmq_env
-   
-      @q.subscribe(:manual_ack => true) do |delivery_info, _properties, body|
+    def listen  
+      @env.job_queue.subscribe(:manual_ack => true) do |delivery_info, _properties, body|
         routing_key=delivery_info[:routing_key]
         GorgService.logger.info "Received message with routing key #{routing_key} containing : #{body}"
         process_message(body,routing_key)
-        @ch.ack(delivery_info.delivery_tag)
+        @env.ch.ack(delivery_info.delivery_tag)
       end
     end
 
@@ -35,18 +31,6 @@ class GorgService
       @rmq_connection
     end
 
-    def set_rabbitmq_env
-      conn = rmq_connection
-      @ch   = conn.create_channel
-      @ch.prefetch(1)
-      @ch.topic(@exchange_name, :durable => true)
-      @q    = @ch.queue(@queue_name, :durable => true)
-
-      @message_handler_map.keys.each do |routing_key|
-        @q.bind(@exchange_name, :routing_key => routing_key)
-      end
-    end
-
     def process_message(body,routing_key)
       message=nil
       incomming_message_error_count=0
@@ -96,19 +80,12 @@ class GorgService
     end
 
     def send_to_deferred_queue(msg)
-      conn=rmq_connection
-      @delayed_chan||=conn.create_channel
-      delayed_queue_name="#{msg.event.gsub(".","-")}_deferred"
-      q=@delayed_chan.queue(delayed_queue_name,
-        durable: true,
-        arguments: {
-            'x-message-ttl' => @deferred_time,
-            'x-dead-letter-exchange' => @exchange_name,
-            'x-dead-letter-routing-key' => msg.event,
-          }
-        )
-      GorgService.logger.info "DEFER MESSAGE : message sent to #{delayed_queue_name} with routing key #{msg.event}"
-      q.publish(msg.to_json, :routing_key => msg.event)
+      if @env.delayed_queue_for msg.event
+        @env.delayed_in_exchange.publish(msg.to_json, :routing_key => msg.event)
+        GorgService.logger.info "DEFER MESSAGE : message sent to #{@env.delayed_in_exchange.name} with routing key #{msg.event}"
+      else
+        raise "DelayedQueueNotFound"
+      end
     end
 
     def message_handler_for routing_key

data/lib/gorg_service/rabbitmq_env_builder.rb

@@ -0,0 +1,83 @@
+class GorgService
+  class RabbitmqEnvBuilder
+
+    def initialize(conn:nil,main_exchange:"", app_id:"", deferred_time: 10000, listened_routing_keys: [])
+      @_conn=conn
+      @app_id=app_id
+      @main_exchange_name=main_exchange
+      @deferred_time=deferred_time
+      @delayed_queues={}
+      @listened_routing_keys=listened_routing_keys
+      set_logger
+    end
+
+    def conn
+      @_conn.start unless @_conn.connected?
+      @_conn
+    end
+
+    def ch
+      @_ch = (@_ch && @_ch.status == :open) ? @_ch : conn.create_channel
+    end
+
+    def main_exchange
+      ch.topic(@main_exchange_name, :durable => true)
+    end
+
+    def delayed_in_exchange
+     ch.topic("#{@app_id}_delayed_in_x", :durable => true)
+    end
+
+    def delayed_out_exchange
+      ch.fanout("#{@app_id}_delayed_out_x", :durable => true)
+    end
+
+    def job_queue
+      GorgService.logger.debug @listened_routing_keys
+      q=ch.queue("#{@app_id}_job_q", :durable => true)
+      q.bind delayed_out_exchange
+      @listened_routing_keys.each do |rk|
+        q.bind(main_exchange, :routing_key => rk)
+      end
+      q
+    end
+
+    def delayed_queue_for routing_key
+      @delayed_queues[routing_key]||= create_delayed_queue_for(routing_key)
+    end
+
+    private
+
+    def set_logger
+      x=ch.fanout("log", :durable => true)
+      x.bind(main_exchange, :routing_key => "*")
+      x.bind(delayed_in_exchange, :routing_key => "*")
+    end
+
+    def create_delayed_queue_for(routing_key)
+      q_name="#{@app_id}_#{routing_key.gsub(".","-")}_deferred_q"
+
+      begin
+        q=ch.queue(q_name,
+          durable: true,
+          arguments: {
+              'x-message-ttl' => @deferred_time,
+              'x-dead-letter-exchange' => delayed_out_exchange.name,
+              'x-dead-letter-routing-key' => routing_key,
+            }
+          )
+
+        q.bind(delayed_in_exchange.name, :routing_key => routing_key)
+      rescue Bunny::PreconditionFailed => e
+        if e.message.start_with?("PRECONDITION_FAILED - inequivalent arg")
+          GorgService.logger.fatal("Mismatching configuration : admin action necessary. Error was : #{e.message}")
+          raise "MismatchingConfig"
+        end
+        raise
+      end
+    end
+
+  end
+end
+
+#ch.queue(test,  durable: true, arguments: {'x-message-ttl' => 1000,'x-dead-letter-exchange' => "agoram_event_exchange",'x-dead-letter-routing-key' => "test",})

data/lib/gorg_service/version.rb

@@ -2,5 +2,5 @@
 # encoding: utf-8
 
 class GorgService
-  VERSION = "3.0.0"
+  VERSION = "4.0.0"
 end

data/lib/gorg_service.rb

@@ -2,6 +2,7 @@ require "gorg_message_sender"
 require "gorg_service/configuration"
 require "gorg_service/version"
 require "gorg_service/errors"
+require "gorg_service/rabbitmq_env_builder"
 require "gorg_service/listener"
 require "gorg_service/message"
 require "gorg_service/message_handler"
@@ -10,7 +11,7 @@ require "gorg_service/message_handler"
 RabbitmqProducer=GorgMessageSender.dup
 
 class GorgService
-  def initialize(listener: nil, bunny_session: nil)
+  def initialize(listener: nil, bunny_session: nil, rabbitmq_env:nil)
 
     @bunny_session= bunny_session || Bunny.new(
       :hostname => GorgService.configuration.rabbitmq_host,
@@ -20,12 +21,18 @@ class GorgService
       :vhost => GorgService.configuration.rabbitmq_vhost
       )
 
+    @env=rabbitmq_env || RabbitmqEnvBuilder.new(
+      conn: @bunny_session,
+      main_exchange: GorgService.configuration.rabbitmq_exchange_name,
+      app_id:GorgService.configuration.application_id,
+      deferred_time: GorgService.configuration.rabbitmq_deferred_time,
+      listened_routing_keys: GorgService.configuration.message_handler_map.keys,
+    )
+
     @listener= listener || Listener.new(
       bunny_session: @bunny_session,
       message_handler_map:GorgService.configuration.message_handler_map,
-      queue_name: GorgService.configuration.rabbitmq_queue_name,
-      exchange_name: GorgService.configuration.rabbitmq_exchange_name,
-      deferred_time: GorgService.configuration.rabbitmq_deferred_time,
+      env: @env,
       max_attempts: GorgService.configuration.rabbitmq_max_attempts,
       log_routing_key: GorgService.configuration.log_routing_key
       )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gorg_service
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Alexandre Narbonne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -159,6 +159,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- bin/worker
 - gorg_service.gemspec
 - lib/gorg_service.rb
 - lib/gorg_service/configuration.rb
@@ -168,6 +169,7 @@ files:
 - lib/gorg_service/message/error_log.rb
 - lib/gorg_service/message/json_schema.rb
 - lib/gorg_service/message_handler.rb
+- lib/gorg_service/rabbitmq_env_builder.rb
 - lib/gorg_service/version.rb
 homepage: https://github.com/Zooip/gorg_service
 licenses: