modern_times 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/examples/exception_test/bar_worker.rb

@@ -0,0 +1,8 @@
+require 'base_worker'
+
+class BarWorker < BaseWorker
+
+  def perform
+    raise "Raising my exception #{self.class.name}"
+  end
+end

data/examples/exception_test/base_worker.rb

@@ -0,0 +1,23 @@
+class BaseWorker
+  include ModernTimes::Base::Worker
+
+  def start
+    while true do
+      sleep 1
+      perform
+    end
+  rescue Exception => e
+    puts "Caught #{e.inspect}"
+  end
+
+  def perform
+    raise "Need to override perform method in #{self.class.name}"
+  end
+
+  def stop
+  end
+
+  def status
+    "Need to override status method in #{self.class.name}"
+  end
+end

data/examples/exception_test/manager.rb

@@ -0,0 +1,11 @@
+# Allow examples to be run in-place without requiring a gem install
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../../lib'
+
+require 'rubygems'
+require 'modern_times'
+require 'bar_worker'
+
+manager = ModernTimes::Manager.new
+manager.stop_on_signal
+manager.add(BarWorker, 2, {})
+manager.join

data/examples/requestor/reverse_echo_worker.rb

@@ -8,6 +8,9 @@ class ReverseEchoWorker
       sleep $1.to_f
       puts "#{self}: Finished sleeping at #{Time.now}"
     end
+    if obj =~ /^Exception/
+      raise Exception, 'You requested an exception'
+    end
     obj.reverse
   end
 end

data/lib/modern_times.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'modern_times/exception'
+require 'modern_times/remote_exception'
 require 'modern_times/marshal_strategy'
 require 'modern_times/base'
 require 'modern_times/jms'

data/lib/modern_times/base/worker.rb

@@ -26,7 +26,7 @@ module ModernTimes
       def setup
       end
 
-      def start(name)
+      def start
         raise "Need to override start method in #{self.class.name}"
       end
 

data/lib/modern_times/jms.rb

@@ -19,5 +19,17 @@ module ModernTimes
         return false
       end
     end
+
+    def self.create_message(session, marshaler, object)
+      case marshaler.marshal_type
+        when :text
+          session.create_text_message(marshaler.marshal(object))
+        when :bytes
+          msg = session.create_bytes_message()
+          msg.data = marshaler.marshal(object)
+          msg
+        else raise "Invalid marshal type: #{marshaler.marshal_type}"
+      end
+    end
   end
 end

data/lib/modern_times/jms/publisher.rb

@@ -38,15 +38,7 @@ module ModernTimes
       def publish(object, props={})
         message = nil
         Connection.session_pool.producer(@real_producer_options) do |session, producer|
-          message = case @marshaler.marshal_type
-                      when :text
-                        session.create_text_message(@marshaler.marshal(object))
-                      when :bytes
-                        msg = session.create_bytes_message()
-                        msg.data = @marshaler.marshal(object)
-                        msg
-                      else raise "Invalid marshal type: #{@marshaler.marshal_type}"
-                    end
+          message = ModernTimes::JMS.create_message(session, @marshaler, object)
           message.jms_delivery_mode_sym = @persistent
           props.each do |key, value|
             message.send("#{key}=", value)

data/lib/modern_times/jms_requestor/request_handle.rb

@@ -1,4 +1,5 @@
 require 'timeout'
+require 'yaml'
 
 module ModernTimes
   module JMSRequestor
@@ -26,6 +27,9 @@ module ModernTimes
           end
         end
         raise Timeout::Error, "Timeout waiting for for response from message #{@message.jms_message_id} on queue #{@reply_queue}" unless response
+        if error_yaml = response['Exception']
+          raise ModernTimes::RemoteException.from_hash(YAML.load(error_yaml))
+        end
         return @requestor.marshaler.unmarshal(response.data)
       end
     end

data/lib/modern_times/jms_requestor/worker.rb

@@ -4,6 +4,7 @@ module ModernTimes
     # Base Worker Class for any class that will be processing messages from queues
     module Worker
       include ModernTimes::JMS::Worker
+      attr_reader :error_count
 
       module ClassMethods
         def create_supervisor(manager, worker_options)
@@ -20,11 +21,12 @@ module ModernTimes
 
       def initialize(opts={})
         super
-        @time_mutex = Mutex.new
-        @count      = 0
-        @min_time   = nil
-        @max_time   = 0.0
-        @total_time = 0.0
+        @time_mutex  = Mutex.new
+        @count       = 0
+        @error_count = 0
+        @min_time    = nil
+        @max_time    = 0.0
+        @total_time  = 0.0
       end
 
       def perform(object)
@@ -32,9 +34,8 @@ module ModernTimes
         response = request(object)
         response_time = Time.now - start_time
         session.producer(:destination => message.reply_to) do |producer|
-          reply_message = session.message(self.class.marshaler.marshal(response))
+          reply_message = ModernTimes::JMS.create_message(session, self.class.marshaler, response)
           reply_message.jms_correlation_id = message.jms_message_id
-          #producer.send_with_retry(reply_message)
           producer.send(reply_message)
         end
         @time_mutex.synchronize do
@@ -43,6 +44,20 @@ module ModernTimes
           @min_time    = response_time if !@min_time || response_time < @min_time
           @max_time    = response_time if response_time > @max_time
         end
+      rescue Exception => e
+        @time_mutex.synchronize do
+          @error_count += 1
+        end
+        begin
+          session.producer(:destination => message.reply_to) do |producer|
+            reply_message = ModernTimes::JMS.create_message(session, ModernTimes::MarshalStrategy::String, "Exception: #{e.message}")
+            reply_message.jms_correlation_id = message.jms_message_id
+            reply_message['Exception'] = ModernTimes::RemoteException.new(e).to_hash.to_yaml
+            producer.send(reply_message)
+          end
+        rescue Exception => e
+          ModernTimes.logger.error("Exception in exception reply: #{e.message}\n\t#{e.backtrace.join("\n\t")}")
+        end
       end
 
       def total_time

data/lib/modern_times/manager.rb

@@ -24,14 +24,14 @@ module ModernTimes
         begin
           worker_klass = Object.const_get(worker_klass.to_s)
         rescue
-          raise ModernTimes::Exception, "Invalid class: #{worker_klass}"
+          raise "Invalid class: #{worker_klass}"
         end
       end
       if @allowed_workers && !@allowed_workers.include?(worker_klass)
-        raise ModernTimes::Exception, "Error: #{worker_klass.name} is not an allowed worker"
+        raise "Error: #{worker_klass.name} is not an allowed worker"
       end
       supervisor = worker_klass.create_supervisor(self, worker_options)
-      raise ModernTimes::Exception "A supervisor with name #{supervisor.name} already exists" if find_supervisor(supervisor.name)
+      raise "A supervisor with name #{supervisor.name} already exists" if find_supervisor(supervisor.name)
       mbean = supervisor.create_mbean(@domain)
       @supervisors << supervisor
       supervisor.worker_count = num_workers

data/lib/modern_times/marshal_strategy.rb

@@ -2,6 +2,7 @@ require 'modern_times/marshal_strategy/bson'
 require 'modern_times/marshal_strategy/json'
 require 'modern_times/marshal_strategy/ruby'
 require 'modern_times/marshal_strategy/string'
+require 'modern_times/marshal_strategy/yaml'
 
 # Defines some default marshaling strategies for use in marshaling/unmarshaling objects
 # written and read via jms.  Implementing classes must define the following methods:
@@ -35,6 +36,7 @@ module ModernTimes
                  when :string then String
                  when :json   then JSON
                  when :bson   then BSON
+                 when :yaml   then YAML
                  else raise "Invalid marshal strategy: #{options[:marshal]}"
                end
       elsif marshal_option.respond_to?(:marshal_type)

data/lib/modern_times/marshal_strategy/yaml.rb

@@ -0,0 +1,19 @@
+module ModernTimes
+  module MarshalStrategy
+    module YAML
+      extend self
+
+      def marshal_type
+        :text
+      end
+
+      def marshal(object)
+        object.to_yaml
+      end
+
+      def unmarshal(msg)
+        ::YAML.load(msg)
+      end
+    end
+  end
+end

data/lib/modern_times/railsable.rb

@@ -45,7 +45,7 @@ module ModernTimes
         Rails.logger.info "Messaging disabled"
         @is_jms_enabled = false
         ModernTimes::JMS::Publisher.setup_dummy_publishing(rails_workers)
-        ModernTimes::JMSRequestor::Requestor.setup_dummy_publishing(rails_workers)
+        ModernTimes::JMSRequestor::Requestor.setup_dummy_requesting(rails_workers)
       end
     end
 

data/lib/modern_times/remote_exception.rb

@@ -0,0 +1,42 @@
+module ModernTimes
+  class RemoteException < Exception
+    attr_accessor :originating_exception_name
+    attr_accessor :originating_exception_message
+
+    def initialize(originating_exception=nil, message=nil)
+      super(message)
+      if originating_exception
+        @originating_exception_name = originating_exception.class.name
+        @originating_exception_message = originating_exception.message
+        set_backtrace(originating_exception.backtrace)
+      end
+      @message = message
+    end
+
+    def message
+      @message || @originating_exception_message
+    end
+
+    def message=(msg)
+      @message = msg
+    end
+
+    def to_hash
+      {
+          'message'                       => @message,
+          'originating_exception_name'    => @originating_exception_name,
+          'originating_exception_message' => @originating_exception_message,
+          'backtrace'                     => backtrace
+      }
+    end
+
+    def self.from_hash(hash)
+      exc = new
+      exc.message                       = hash['message']
+      exc.originating_exception_name    = hash['originating_exception_name']
+      exc.originating_exception_message = hash['originating_exception_message']
+      exc.set_backtrace(hash['backtrace'])
+      return exc
+    end
+  end
+end

data/test/base_test.rb

@@ -130,12 +130,12 @@ class BaseTest < Test::Unit::TestCase
     end
 
     should "not be allowed" do
-      e = assert_raises ModernTimes::Exception do
+      e = assert_raises RuntimeError do
         @manager.add(DummyWorker, 2, {:foo => 42})
       end
       assert_match %r%is not an allowed worker%, e.message
 
-      e = assert_raises ModernTimes::Exception do
+      e = assert_raises RuntimeError do
         @manager.add('FdajfsdklasdfWorker', 2, {:foo => 42})
       end
       assert_match %r%Invalid class%, e.message

data/test/jms_test.rb

@@ -202,8 +202,8 @@ class JMSTest < Test::Unit::TestCase
     teardown do
     end
 
-    #[BSONTest, JSONTest, RubyTest, StringTest].each do |marshal_module|
-    [BSONTest, JSONTest, StringTest].each do |marshal_module|
+    [BSONTest, JSONTest, RubyTest, StringTest].each do |marshal_module|
+    #[BSONTest, JSONTest, StringTest].each do |marshal_module|
       marshal_module.name =~ /(.*)Test/
       marshal_type = $1
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 2
-    - 2
-  version: 0.2.2
+    - 3
+  version: 0.2.3
 platform: ruby
 authors: 
   - Brad Pardee
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 -04:00
+date: 2011-04-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -79,7 +79,6 @@ files:
   - lib/modern_times/base/supervisor.rb
   - lib/modern_times/base/supervisor_mbean.rb
   - lib/modern_times/base/worker.rb
-  - lib/modern_times/exception.rb
   - lib/modern_times/jms.rb
   - lib/modern_times/jms/connection.rb
   - lib/modern_times/jms/publisher.rb
@@ -100,7 +99,9 @@ files:
   - lib/modern_times/marshal_strategy/json.rb
   - lib/modern_times/marshal_strategy/ruby.rb
   - lib/modern_times/marshal_strategy/string.rb
+  - lib/modern_times/marshal_strategy/yaml.rb
   - lib/modern_times/railsable.rb
+  - lib/modern_times/remote_exception.rb
   - test/base_test.rb
   - test/jms.yml
   - test/jms_requestor_test.rb
@@ -137,6 +138,9 @@ signing_key:
 specification_version: 3
 summary: Asynchronous task library
 test_files: 
+  - examples/exception_test/bar_worker.rb
+  - examples/exception_test/base_worker.rb
+  - examples/exception_test/manager.rb
   - examples/requestor/manager.rb
   - examples/requestor/request.rb
   - examples/requestor/reverse_echo_worker.rb

data/lib/modern_times/exception.rb

@@ -1,4 +0,0 @@
-module ModernTimes
-  class Exception < ::Exception
-  end
-end