activemessaging 0.10.0 → 0.11.0

data/VERSION

@@ -1 +1 @@
-0.10.0
+0.11.0

data/activemessaging.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "activemessaging"
-  s.version = "0.10.0"
+  s.version = "0.11.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jon Tirsen", "Andrew Kuklewicz", "Olle Jonsson", "Sylvain Perez", "Cliff Moon", "Uwe Kubosch"]
-  s.date = "2012-07-13"
+  s.date = "2012-08-07"
   s.description = "ActiveMessaging is an attempt to bring the simplicity and elegance of rails development to the world of messaging. Messaging, (or event-driven architecture) is widely used for enterprise integration, with frameworks such as Java's JMS, and products such as ActiveMQ, Tibco, IBM MQSeries, etc. Now supporting Rails 3 as of version 0.8.0."
   s.email = "activemessaging-discuss@googlegroups.com"
   s.extra_rdoc_files = [

data/lib/activemessaging.rb

@@ -36,7 +36,7 @@ module ActiveMessaging
   end
 
   def self.app_root
-    @@app_root ||= (ENV['APP_ROOT'] || (defined?(::Rails) && ::Rails.root) || ENV['RAILS_ROOT'] || File.dirname($0))
+    @@app_root ||= (ENV['APP_ROOT'] || (defined?(::Rails) && ::Rails.root) || ENV['RAILS_ROOT'] || File.expand_path(Dir.pwd))
   end
 
   def self.app_env
@@ -74,10 +74,10 @@ module ActiveMessaging
   end
 
   def self.load_processors(first=true)
-    logger.info "ActiveMessaging: Loading #{app_root}/app/processors/application.rb" if first
-    load "#{app_root}/app/processors/application.rb" if File.exist?("#{app_root}/app/processors/application.rb")
+    logger.info "ActiveMessaging: Loading #{app_root}/app/processors/application_processor.rb" if first
+    load "#{app_root}/app/processors/application_processor.rb" if File.exist?("#{app_root}/app/processors/application_processor.rb")
     Dir["#{app_root}/app/processors/*.rb"].each do |f|
-      unless f.match(/\/application.rb/)
+      unless f.match(/\/application_processor.rb/)
         logger.info "ActiveMessaging: Loading #{f}" if first
         load f
       end

data/lib/activemessaging/adapters/asqs.rb

@@ -95,6 +95,20 @@ module ActiveMessaging
           send_messsage queue, message_body
         end
 
+        # def receive(options={})
+        #   while true
+        #     # this will try all the queues once, by priority
+        #     # returns nil if nothing there
+        #     message = receive_message(options)
+
+        #     if message
+        #       return message
+        #     else
+        #       sleep(poll_interval)
+        #     end
+        #   end
+        # end
+
         #  new receive respects priorities
         def receive(options={})
           message = nil

data/lib/activemessaging/gateway.rb

@@ -49,8 +49,12 @@ module ActiveMessaging
                   @guard.synchronize {
                     dispatch Thread.current[:message]
                   }
+                  Thread.current[:message] = nil
+                else
+                  # if there is no message at all, sleep
+                  # maybe this should be configurable
+                  sleep(1)
                 end
-                Thread.current[:message] = nil
               end
               Thread.pass
             end
@@ -63,7 +67,7 @@ module ActiveMessaging
           living = false
           @connection_threads.each { |name, thread| living ||=  thread.alive? }
           @running = living
-          sleep 1
+          sleep(1)
         end
         ActiveMessaging.logger.error "All connection threads have died..."
       rescue Interrupt

data/lib/activemessaging/threaded_poller.rb

@@ -73,9 +73,16 @@ module ActiveMessaging
       # indicates to all busy workers not to pick up another messages, but does not interrupt
       # also indicates to the message receiver to stop getting more messages 
       self.running = false
-      
+
       # tell each waiting worker to shut down.  Running ones will be allowed to finish
-      workers.each { |w| w.terminate if w.alive? }
+      receiver.terminate! if receiver.alive?
+      logger.info "ActiveMessaging::ThreadedPoller receiver terminated"
+
+      workers.each { |w| w.terminate! if w.alive? }
+      logger.info "ActiveMessaging::ThreadedPoller workers terminated"
+
+
+      after(0) { signal(:shutdown) } if stopped?
     end
 
     # recursive method, uses celluloid 'after' to keep calling 
@@ -105,16 +112,16 @@ module ActiveMessaging
         worker.terminate if worker.alive?
         if busy.empty?
           logger.info "all executed: signal stopped"
-          self.terminate if alive?
+          after(0) { signal(:shutdown) }
         end
       end
     end
 
     def died(worker, reason)
-      logger.info "uh oh, #{worker.inspect} died because of #{reason.class}"
       busy.delete(worker)
 
       if running
+        logger.info "uh oh, #{worker.inspect} died because of #{reason.class}"
         worker = Worker.new_link(current_actor)
         workers << worker
         receive(worker)
@@ -122,13 +129,13 @@ module ActiveMessaging
         logger.info "check to see if busy is empty: #{busy.inspect}"
         if busy.empty?
           logger.info "all died: signal stopped"
-          after(0){ self.terminate } if alive?
+          after(0){ signal(:shutdown) }
         end
       end
     end
     
     def stopped?
-      !alive? || (!running && busy.empty?)
+      (!running && busy.empty?)
     end
 
     def logger; ActiveMessaging.logger; end
@@ -153,20 +160,25 @@ module ActiveMessaging
     def receive(worker)
       return unless poller.running
 
+      # logger.debug("***** MessageReceiver calling receive")
       message = self.connection.receive(worker.options)
+      # logger.debug("***** MessageReceiver receive returned")
 
       if message
         logger.debug("ActiveMessaging::MessageReceiver.receive: message:'#{message.inspect}'")
         poller.dispatch!(message, worker)
       else
-        self.terminate if !poller.running && alive?  
+        if (!poller || !poller.alive? || !poller.running)
+          logger.debug("ActiveMessaging::MessageReceiver.receive: terminate")
+          self.terminate
+        end
         logger.debug("ActiveMessaging::MessageReceiver.receive: no message, retry in #{pause} sec")
         after(pause) { receive(worker) }
       end
       
     end
 
-    def logger; ActiveMessaging.logger; end
+    def logger; ::ActiveMessaging.logger; end
   end
 
   class Worker
@@ -180,11 +192,16 @@ module ActiveMessaging
     end
 
     def execute(message)
-      ActiveMessaging::Gateway.dispatch(message)
+      begin
+        ::ActiveMessaging::Gateway.dispatch(message)
+      ensure
+        ::ActiveRecord::Base.clear_active_connections! if defined?(::ActiveRecord)
+      end
+
       poller.executed!(current_actor)
     end
 
-    def logger; ActiveMessaging.logger; end
+    def logger; ::ActiveMessaging.logger; end
     
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemessaging
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport