modern_times 0.3.10 → 0.3.11

data/History.md

@@ -1,6 +1,11 @@
 ModernTimes Changelog
 =====================
 
+0.3.11
+-----
+
+ - Dummy publishing mode was not thread safe
+
 0.3.10
 -----
 

data/Rakefile

@@ -13,6 +13,7 @@ begin
     gemspec.homepage = 'http://github.com/ClarityServices/modern_times'
     gemspec.add_dependency 'jruby-jms', ['>= 0.11.2']
     gemspec.add_dependency 'jmx',  ['>= 0.6']
+    gemspec.add_dependency 'gene_pool'
   end
 rescue LoadError
   puts 'Jeweler not available. Install it with: gem install jeweler'

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.11

data/lib/modern_times/jms/publisher.rb

@@ -82,30 +82,32 @@ module ModernTimes
         dummy_handle = PublishHandle.new(self, nil, Time.now)
         # Model real queue marshaling/unmarshaling
         trans_object = @marshaler.unmarshal(@marshaler.marshal(object))
-        @@workers.each do |worker|
-          if ModernTimes::JMS.same_destination?(@producer_options, worker.destination_options)
-            if worker.kind_of?(RequestWorker)
-              ModernTimes.logger.debug "Dummy request publishing #{trans_object} to #{worker}"
-              m = worker.marshaler
-              # Model real queue marshaling/unmarshaling
-              begin
-                response_object = m.unmarshal(m.marshal(worker.request(trans_object)))
-                dummy_handle.add_dummy_response(worker.name, response_object)
-              rescue Exception => e
-                ModernTimes.logger.error("#{worker} Exception: #{e.message}\n\t#{e.backtrace.join("\n\t")}")
-                dummy_handle.add_dummy_response(worker.name, ModernTimes::RemoteException.new(e))
-              end
-              begin
-                worker.post_request(trans_object)
-              rescue Exception => e
-                ModernTimes.logger.error("#{worker} Exception in post_request: #{e.message}\n\t#{e.backtrace.join("\n\t")}")
-              end
-            elsif worker.kind_of?(Worker)
-              ModernTimes.logger.debug "Dummy publishing #{trans_object} to #{worker}"
-              begin
-                worker.perform(trans_object)
-              rescue Exception => e
-                ModernTimes.logger.error("#{worker} Exception: #{e.message}\n\t#{e.backtrace.join("\n\t")}")
+        @@worker_pools.each do |worker_pool|
+          worker_pool.with_connection do |worker|
+            if ModernTimes::JMS.same_destination?(@producer_options, worker.destination_options)
+              if worker.kind_of?(RequestWorker)
+                ModernTimes.logger.debug "Dummy request publishing #{trans_object} to #{worker}"
+                m = worker.marshaler
+                # Model real queue marshaling/unmarshaling
+                begin
+                  response_object = m.unmarshal(m.marshal(worker.request(trans_object)))
+                  dummy_handle.add_dummy_response(worker.name, response_object)
+                rescue Exception => e
+                  ModernTimes.logger.error("#{worker} Exception: #{e.message}\n\t#{e.backtrace.join("\n\t")}")
+                  dummy_handle.add_dummy_response(worker.name, ModernTimes::RemoteException.new(e))
+                end
+                begin
+                  worker.post_request(trans_object)
+                rescue Exception => e
+                  ModernTimes.logger.error("#{worker} Exception in post_request: #{e.message}\n\t#{e.backtrace.join("\n\t")}")
+                end
+              elsif worker.kind_of?(Worker)
+                ModernTimes.logger.debug "Dummy publishing #{trans_object} to #{worker}"
+                begin
+                  worker.perform(trans_object)
+                rescue Exception => e
+                  ModernTimes.logger.error("#{worker} Exception: #{e.message}\n\t#{e.backtrace.join("\n\t")}")
+                end
               end
             end
           end
@@ -117,9 +119,9 @@ module ModernTimes
         "#{self.class.name}:#{@real_producer_options.inspect}"
       end
 
-      def self.setup_dummy_publishing(workers)
+      def self.setup_dummy_publishing(worker_pools)
         @@dummy_publishing = true
-        @@workers = workers
+        @@worker_pools = worker_pools
         alias_method :real_publish, :publish
         alias_method :publish, :dummy_publish
         PublishHandle.setup_dummy_handling

data/lib/modern_times/railsable.rb

@@ -41,13 +41,22 @@ module ModernTimes
         Rails.logger.info "Messaging disabled"
         @is_jms_enabled = false
         worker_file     = File.join(Rails.root, "config", "workers.yml")
-        workers = []
+        worker_pools = []
         ModernTimes::Manager.parse_worker_file(worker_file, @env) do |klass, count, options|
-          workers << klass.new(options)
+          # Create a pool for each worker so a single instance won't have to be thread safe when multiple http request hit it concurrently.
+          worker_pools << GenePool.new(:pool_size => count, :logger => Rails.logger) do
+            klass.new(options)
+          end
+        end
+        # If no config, then just create a worker_pool for each class in the app/workers directory
+        if worker_pools.empty?
+          worker_pools = rails_workers.map do |klass|
+            GenePool.new(:pool_size => 1, :logger => Rails.logger) do
+              klass.new({})
+            end
+          end
         end
-        # If no config, then just create a worker for each class in the app/workers directory
-        workers = rails_workers.map {|klass| klass.new({})} if workers.empty?
-        ModernTimes::JMS::Publisher.setup_dummy_publishing(workers)
+        ModernTimes::JMS::Publisher.setup_dummy_publishing(worker_pools)
       end
     end
 

metadata

@@ -2,7 +2,7 @@
 name: modern_times
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors: 
   - Brad Pardee
@@ -11,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-17 00:00:00 -04:00
-default_executable: 
+date: 2011-11-08 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: jruby-jms
@@ -36,6 +35,17 @@ dependencies:
             version: "0.6"
     type: :runtime
     version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: gene_pool
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id003
 description: Generic asynchronous task library
 email: 
   - bradpardee@gmail.com
@@ -110,7 +120,6 @@ files:
   - test/jms_requestor_test.rb
   - test/jms_test.rb
   - test/marshal_strategy_test.rb
-has_rdoc: true
 homepage: http://github.com/ClarityServices/modern_times
 licenses: []
 
@@ -134,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Asynchronous task library