gorg_service 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b61b732f42639dd14b22f68e32bf318e598c10f1
-  data.tar.gz: 22e05f3bf14224e468001802a6a59fd28b40f9b9
+  metadata.gz: 73ff949459f530d6de5e500a065a69082b633c13
+  data.tar.gz: f33f7599bf4a38afd2c3c3070757109c45e69f61
 SHA512:
-  metadata.gz: a407353c48c6c6ddacb7f8ea95c0bd65bf5b289cb95eb4820a1000ffdc6f8639456c1c63a1ce4221f88cd20f410c5b9fc42ab50e93f07d1fb3f0c7ea94604979
-  data.tar.gz: 00b386980b7eb2e235218f890cbe7194eb9323996c99c6b06eeb5a074e5ade05c40f2d7924ae750da6594cc2cc02eb54ec5a76a59fdfcef8f3a7b7309ee788b1
+  metadata.gz: 1d857d88511bd782177f455248b3ce26d9847916250b8f29658c7e678344fbbabc015570d54e4f5d54e8b461aa706c46578eebb42b696f7bfec9e3891d218255
+  data.tar.gz: bcfb9af25144da6982cabc973c5d1ffb9c70502987bc6faeb7263ce8ad7f9d04fb5e9f946285f98a0e2363d17e8e9876a1d0bcc972bd99aac988f276072676b2

data/Gemfile

@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
-gemspec
-gem "codeclimate-test-reporter", group: :test, require: nil
-gem 'reek', '~> 4.0'
+gemspec

data/README.md

@@ -1,5 +1,6 @@
 # GorgService
 [![Code Climate](https://codeclimate.com/github/Zooip/gorg_service/badges/gpa.svg)](https://codeclimate.com/github/Zooip/gorg_service) [![Test Coverage](https://codeclimate.com/github/Zooip/gorg_service/badges/coverage.svg)](https://codeclimate.com/github/Zooip/gorg_service/coverage) [![Build Status](https://travis-ci.org/Zooip/gorg_service.svg?branch=master)](https://travis-ci.org/Zooip/gorg_service) [![Gem Version](https://badge.fury.io/rb/gorg_service.svg)](https://badge.fury.io/rb/gorg_service) [![Dependency Status](https://gemnasium.com/badges/github.com/Zooip/gorg_service.svg)](https://gemnasium.com/github.com/Zooip/gorg_service)
+
 Standard RabbitMQ bot used in Gadz.org SOA
 
 ## Installation
@@ -52,6 +53,10 @@ GorgService.configure do |c|
   # maximum number of try before discard a message
   # c.rabbitmq_max_attempts = 48 # 24h with default deferring delay
   #
+  # The routing key used when sending a message to the central log system (Hardfail or Warning)
+  # Central logging is disable if nil
+  # c.log_routing_key = nil
+  #
   # Routing hash
   #  map routing_key of received message with MessageHandler 
   #  exemple:
@@ -76,8 +81,7 @@ my_service.run
 When running, GorgService act as a consumer on Gadz.org RabbitMQ network.
 It bind its queue on the main exchange and subscribes to routing keys defines in `message_handler_map`
 
-Each received message will be routed to the corresponding `MessageHandler`
-> **Warning** : RabbitMQ wildcards characters `#` and `*`are NOT supported for now
+Each received message will be routed to the corresponding `MessageHandler`. AMQP wildcards are supported.The first key to match the incomiing routing key will be used.
 
 A `MessageHandler` is a kind of controller. This is where you put the message is processed.
 A `MessageHandler` expect a `GorgService::Message` as param of its `initializer`method.

data/gorg_service.gemspec

@@ -28,12 +28,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'bunny', '~> 2.2', '>= 2.2.2'
   spec.add_dependency 'json-schema', '~> 2.6'
+  spec.add_dependency 'gorg_message_sender', '~> 0'
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "codeclimate-test-reporter", "~> 3.0"
+  spec.add_development_dependency "codeclimate-test-reporter", "~> 0.5.0"
   spec.add_development_dependency 'bogus', '~> 0.1.6'
-  spec.add_development_dependency 'bunny-mock', '~> 1.4'
-  spec.add_development_dependency 'byebug', '~> 9.0'
 end

data/lib/gorg_service.rb

@@ -1,3 +1,4 @@
+require "gorg_message_sender"
 require "gorg_service/configuration"
 require "gorg_service/version"
 require "gorg_service/errors"
@@ -5,9 +6,12 @@ require "gorg_service/listener"
 require "gorg_service/message"
 require "gorg_service/message_handler"
 
+#Duplicate GorgMessageSender to avoid configuration conflict
+RabbitmqProducer=GorgMessageSender.dup
+
 class GorgService
   def initialize(listener: nil, bunny_session: nil)
-    
+
     @bunny_session= bunny_session || Bunny.new(
       :hostname => GorgService.configuration.rabbitmq_host,
       :port => GorgService.configuration.rabbitmq_port,
@@ -23,7 +27,25 @@ class GorgService
       exchange_name: GorgService.configuration.rabbitmq_exchange_name,
       deferred_time: GorgService.configuration.rabbitmq_deferred_time,
       max_attempts: GorgService.configuration.rabbitmq_max_attempts,
+      log_routing_key: GorgService.configuration.log_routing_key
       )
+
+    RabbitmqProducer.configure do |c|
+      # Id used to set the event_sender_id
+      c.application_id = GorgService.configuration.application_id
+
+      # RabbitMQ network and authentification
+      c.host = GorgService.configuration.rabbitmq_host
+      c.port = GorgService.configuration.rabbitmq_port
+      c.vhost = GorgService.configuration.rabbitmq_vhost
+      c.user = GorgService.configuration.rabbitmq_user
+      c.password = GorgService.configuration.rabbitmq_password
+
+      # Exchange configuration
+      c.exchange_name = GorgService.configuration.rabbitmq_exchange_name
+      c.durable_exchange= true      
+    end
+
   end
 
   def run

data/lib/gorg_service/configuration.rb

@@ -27,7 +27,8 @@ class GorgService
                   :rabbitmq_user,
                   :rabbitmq_password,
                   :rabbitmq_vhost,
-                  :message_handler_map
+                  :message_handler_map,
+                  :log_routing_key
 
 
     def initialize
@@ -43,6 +44,7 @@ class GorgService
       @rabbitmq_password       = nil
       @rabbitmq_vhost          = "/"
       @rabbitmq_max_attempts   = 48         #24h with default timeout
+      @log_routing_key         = nil
     end
   end
 end

data/lib/gorg_service/listener.rb

@@ -6,75 +6,93 @@ require "bunny"
 class GorgService
   class Listener
 
-    def initialize(bunny_session: nil,queue_name: "gapps", exchange_name: nil, message_handler_map: {default: DefaultMessageHandler}, deferred_time: 1800000, max_attempts: 48)
+    def initialize(bunny_session: nil,queue_name: "gapps", 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
       @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
 
-      conn = rmq_connection
-      ch   = conn.create_channel
-      x    = 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
-
-      q.bind(@exchange_name, :routing_key => '#')
-
-      ch.prefetch(1)
-
-      q.subscribe(:manual_ack => true) do |delivery_info, properties, body|
+      set_rabbitmq_env
+   
+      @q.subscribe(:manual_ack => true) do |delivery_info, _properties, body|
         routing_key=delivery_info[:routing_key]
         puts " [#] Received message with routing key #{routing_key} containing : #{body}"
-        message_handler=message_handler_for routing_key
-        message=Message.parse_body(body)
-
-        call_message_handler(message_handler, message)
-
-        ch.ack(delivery_info.delivery_tag)
+        process_message(body,routing_key)
+        @ch.ack(delivery_info.delivery_tag)
       end
-
     end
 
+    protected
+
     def rmq_connection
       @rmq_connection.start unless @rmq_connection.connected?
       @rmq_connection
     end
 
-    def call_message_handler(message_handler, message)
-      begin
-        raise HardfailError.new(), "Routing error" unless message_handler
-          message_handler.new(message)
+    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
+      begin 
+        message_handler=message_handler_for routing_key
+        raise HardfailError.new("Routing error : No message handler finded for this routing key") unless message_handler
+
+        begin
+          message=Message.parse_body(body)
+        rescue JSON::ParserError => e
+          raise HardfailError.new("JSON Parse error : Can't parse incoming message",e)
+        rescue JSON::Schema::ValidationError => e
+          raise HardfailError.new("Invalid JSON : This message does not respect Gadz.org JSON Schema",e)
+        end
+        incomming_message_error_count=message.errors.count
+        message_handler.new(message)
+        process_logging(message) if message.errors.count>incomming_message_error_count
       rescue SoftfailError => e
-        message.log_error(e)
         process_softfail(e,message)
-
       rescue HardfailError => e
-        message.log_error(e)
-        process_hardfail(e)      
+        process_hardfail(e,message)
       end
     end
 
     def process_softfail(e,message)
+        message.log_error(e)
         puts " [*] SOFTFAIL ERROR : #{e.message}"
         if message.errors.count >= @max_attempts
           puts " [*] DISCARD MESSAGE : #{message.errors.count} errors in message log"
+          process_hardfail(HardfailError.new("Too Much SoftError : This message reached the limit of softerror (max: #{@max_attempts})"),message)
         else
           send_to_deferred_queue(message)
         end
     end
 
-    def process_hardfail(e)
-      puts " [*] SOFTFAIL ERROR : #{e.message}"
-      puts " [*] DISCARD MESSAGE"    
+    def process_hardfail(e,message)
+      puts " [*] HARDFAIL ERROR : #{e.message}"
+      puts " [*] DISCARD MESSAGE"
+      if message
+        message.log_error(e)
+        process_logging(message)
+      end
+    end
+
+    def process_logging(message)
+      RabbitmqProducer.new.send_raw(message.to_json,@log_routing_key, verbose: true) if @log_routing_key
     end
 
     def send_to_deferred_queue(msg)

data/lib/gorg_service/message.rb

@@ -31,8 +31,7 @@ class GorgService
       @sender= sender
     end
 
-    # Generate RabbitMQ message body
-    def to_json
+    def to_h
       body={
         event_uuid: @id,
         event_name: @event,
@@ -44,7 +43,12 @@ class GorgService
         body[:errors_count]=@errors.count
         body[:errors]=@errors
       end
-      body.to_json
+      body
+    end
+
+    # Generate RabbitMQ message body
+    def to_json
+      self.to_h.to_json
     end
 
     # Log FailError in message body

data/lib/gorg_service/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gorg_service
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Alexandre Narbonne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -44,6 +44,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: gorg_message_sender
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bogus
   requirement: !ruby/object:Gem::Requirement
@@ -114,34 +128,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.6
-- !ruby/object:Gem::Dependency
-  name: bunny-mock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.0'
 description: 
 email:
 - alexandre.narbonne@gadz.org