qwirk_jms_adapter 0.1.0-java → 0.2.0-java

data/History.md

@@ -1,6 +1,11 @@
 Qwirk Changelog
 =====================
 
+0.2.0
+-----
+
+ - Various fixes and improving of the shutdown logic.
+
 0.1.0
 -----
 

data/lib/qwirk/adapter/jms/connection.rb

@@ -11,10 +11,6 @@ module Qwirk
           @connection = ::JMS::Connection.new(config)
           @session_pool = @connection.create_session_pool(@config)
           @connection.start
-
-          at_exit do
-            close
-          end
         end
 
         # Create a session targeted for a consumer (producers should use the session_pool)

data/lib/qwirk/adapter/jms/util.rb

@@ -17,7 +17,7 @@ module Qwirk
 
           def parse_response(message)
             if error_yaml = message['qwirk:exception']
-              return Qwirk::RemoteException.from_hash(YAML.load(error_yaml))
+              return Qwirk::RemoteException.unmarshal(error_yaml)
             end
             marshaler = Qwirk::MarshalStrategy.find(message['qwirk:marshal'] || WorkerConfig.default_marshal_sym)
             return marshaler.unmarshal(message.data)

data/lib/qwirk/adapter/jms/worker.rb

@@ -14,6 +14,9 @@ module Qwirk
 
         def receive_message
           @consumer.receive
+        rescue Exception => e
+          Qwirk.logger.warn "Error during receive: #{e.message}"
+          return nil
         end
 
         def acknowledge_message(msg)
@@ -27,7 +30,7 @@ module Qwirk
         def send_exception(original_message, e)
           @string_marshaler ||= MarshalStrategy.find(:string)
           do_send_response(@string_marshaler, original_message, "Exception: #{e.message}") do |reply_message|
-            reply_message['qwirk:exception'] = Qwirk::RemoteException.new(e).to_hash.to_yaml
+            reply_message['qwirk:exception'] = Qwirk::RemoteException.new(e).marshal
           end
         end
 
@@ -53,6 +56,10 @@ module Qwirk
           @stopped = true
         end
 
+        def ready_to_stop?
+          true
+        end
+
         private
 
         def do_send_response(marshaler, original_message, marshaled_object)

data/lib/qwirk/adapter/jms/worker_config.rb

@@ -25,6 +25,12 @@ module Qwirk
         def create_worker
           Worker.new(self)
         end
+
+        def stop
+          Qwirk.logger.debug { "Stopping #{self}" }
+          @connection.close
+          super
+        end
       end
     end
   end

metadata

@@ -2,79 +2,79 @@
 name: qwirk_jms_adapter
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.1.0
+  version: 0.2.0
 platform: java
 authors:
 - Brad Pardee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000Z
+date: 2012-09-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jruby-jms
-  version_requirements: &4114 !ruby/object:Gem::Requirement
+  version_requirements: &4126 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.11.2
     none: false
-  requirement: *4114
+  requirement: *4126
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: jruby-activemq
-  version_requirements: &4132 !ruby/object:Gem::Requirement
+  version_requirements: &4144 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  requirement: *4132
+  requirement: *4144
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: gene_pool
-  version_requirements: &4148 !ruby/object:Gem::Requirement
+  version_requirements: &4160 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
     none: false
-  requirement: *4148
+  requirement: *4160
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: qwirk
-  version_requirements: &4164 !ruby/object:Gem::Requirement
+  version_requirements: &4176 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
     none: false
-  requirement: *4164
+  requirement: *4176
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &4180 !ruby/object:Gem::Requirement
+  version_requirements: &4192 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  requirement: *4180
+  requirement: *4192
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rdoc
-  version_requirements: &4198 !ruby/object:Gem::Requirement
+  version_requirements: &4210 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  requirement: *4198
+  requirement: *4210
   prerelease: false
   type: :development
 description: Provides a JMS adapter as a communication interface for the qwirk library