esp-commons 0.3.1 → 0.3.2

data/lib/esp-commons/libraries/message_maker.rb

@@ -6,10 +6,12 @@ class MessageMaker
 
     amqp_client.start
 
-    exchange = amqp_client.exchange('esp', :type => :topic)
+    exchange = amqp_client.exchange(queue_name, :type => :topic)
 
     queue = amqp_client.queue(queue_name, :durable => true)
 
+    queue.bind(exchange, :key => '*')
+
     exchange.publish(message, :key => routing_key, :persistent => true)
 
     amqp_client.stop

data/lib/esp-commons/libraries/subscriber.rb

@@ -2,44 +2,53 @@ require 'amqp'
 
 class Subscriber
   def start
-    logger.debug "RAILS_ENV=#{Rails.env}"
-    subscribers.each do |subscriber|
-      AMQP.start(Settings['amqp.url']) do |connection|
+    logger.debug "Subscribers runned in #{Rails.env} environment"
+    AMQP.start(Settings['amqp.url']) do |connection|
+      Signal.trap("TERM") do
+        logger.info "All subscribers stopped"
+        connection.close do
+          EM.stop { exit }
+        end
+      end
+      subscribers.each do |subscriber|
         channel = AMQP::Channel.new(connection)
         channel.prefetch(1)
 
-        exchange = channel.topic('esp')
-        queue = channel.queue(queue_name(subscriber), :durable => true)
+        topic = routing_prefix(subscriber)
 
-        queue.bind(exchange, :routing_key => '*')
+        exchange = channel.topic(topic)
+        queue = channel.queue(topic, :durable => true)
 
-        Signal.trap("TERM") do
-          connection.close do
-            logger.info "#{subscriber.class} stopped"
-            EM.stop { exit }
-          end
-        end
+        queue.bind(exchange, :routing_key => "*")
 
         queue.subscribe(:ack => true) do |header, message|
           method = header.routing_key
+          logger.debug "#{subscriber.class} receive #{method}: #{message}"
           if subscriber.respond_to?(method)
-            logger.debug("#{subscriber.class} receive #{method}: #{message}")
-            subscriber.send(method, message)
-            header.ack
+            begin
+              defined?(ActiveRecord::Base) and ActiveRecord::Base.establish_connection
+              subscriber.send(method, message)
+              logger.debug "#{subscriber.class} successfully executed #{method}"
+            rescue => e
+              logger.warn "#{subscriber.class} error while executing #{method} - #{e.message}"
+            end
           else
-            logger.warn "#{subscriber.class} not respond to #{method}"
+            logger.warn "#{subscriber.class} cann't execute #{method} due #{subscriber.class} not respond to #{method}"
           end
+          header.ack
         end
 
-        logger.info "#{subscriber.class} started"
+        logger.info "#{subscriber.class} listen #{queue.name}"
       end
     end
   end
 
   def subscribers
-    Dir.glob("#{Rails.root}/lib/subscribers/*").map do |subscriber_path|
+    Dir.glob("#{Rails.root}/lib/subscribers/*_subscriber.rb").map do |subscriber_path|
       require subscriber_path
-      File.basename(subscriber_path, '.rb').classify.constantize.new
+      File.basename(subscriber_path, '.rb').classify.constantize.new.tap do |subscriber|
+        subscriber.logger = logger if subscriber.respond_to? :logger=
+      end
     end
   end
 
@@ -48,7 +57,7 @@ class Subscriber
   end
 
   private
-    def queue_name(subscriber)
+    def routing_prefix(subscriber)
       from = subscriber.class.name.sub(/Subscriber$/, '').underscore
       to = Rails.application.class.name.sub('::Application', '').underscore
 

data/lib/esp-commons/version.rb

@@ -1,3 +1,3 @@
 module EspCommons
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-commons
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000 Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &16840440 !ruby/object:Gem::Requirement
+  requirement: &9792180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16840440
+  version_requirements: *9792180
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &16867680 !ruby/object:Gem::Requirement
+  requirement: &9819120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16867680
+  version_requirements: *9819120
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &16867100 !ruby/object:Gem::Requirement
+  requirement: &9818540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16867100
+  version_requirements: *9818540
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &16866360 !ruby/object:Gem::Requirement
+  requirement: &9817840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16866360
+  version_requirements: *9817840
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &16865340 !ruby/object:Gem::Requirement
+  requirement: &9816640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16865340
+  version_requirements: *9816640
 - !ruby/object:Gem::Dependency
   name: openteam-commons
-  requirement: &16864620 !ruby/object:Gem::Requirement
+  requirement: &9816040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16864620
+  version_requirements: *9816040
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &16864140 !ruby/object:Gem::Requirement
+  requirement: &9815560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16864140
+  version_requirements: *9815560
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &16862880 !ruby/object:Gem::Requirement
+  requirement: &9814360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16862880
+  version_requirements: *9814360
 description: Description of EspCommons.
 email:
 - mail@openteam.ru
@@ -134,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3357116084122121062
+      hash: -177488127929603302
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3357116084122121062
+      hash: -177488127929603302
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15