isono 0.2.8 → 0.2.9

data/isono.gemspec

@@ -2,20 +2,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{isono}
-  s.version = "0.2.8"
+  s.version = "0.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["axsh Ltd.", "Masahiro Fujiwara"]
-  s.date = %q{2011-08-24}
-  s.default_executable = %q{cli}
-  s.email = ["dev@axsh.net", "m-fujiwara@axsh.net"]
-  s.executables = ["cli"]
-  s.files = [".gitignore", "LICENSE", "NOTICE", "Rakefile", "bin/cli", "isono.gemspec", "lib/ext/shellwords.rb", "lib/isono.rb", "lib/isono/amqp_client.rb", "lib/isono/daemonize.rb", "lib/isono/event_delegate_context.rb", "lib/isono/event_observable.rb", "lib/isono/logger.rb", "lib/isono/manifest.rb", "lib/isono/messaging_client.rb", "lib/isono/models/event_log.rb", "lib/isono/models/job_state.rb", "lib/isono/models/node_state.rb", "lib/isono/models/resource_instance.rb", "lib/isono/node.rb", "lib/isono/node_modules/base.rb", "lib/isono/node_modules/data_store.rb", "lib/isono/node_modules/event_channel.rb", "lib/isono/node_modules/event_logger.rb", "lib/isono/node_modules/job_channel.rb", "lib/isono/node_modules/job_collector.rb", "lib/isono/node_modules/job_worker.rb", "lib/isono/node_modules/node_collector.rb", "lib/isono/node_modules/node_heartbeat.rb", "lib/isono/node_modules/rpc_channel.rb", "lib/isono/rack.rb", "lib/isono/rack/builder.rb", "lib/isono/rack/data_store.rb", "lib/isono/rack/job.rb", "lib/isono/rack/map.rb", "lib/isono/rack/object_method.rb", "lib/isono/rack/proc.rb", "lib/isono/rack/thread_pass.rb", "lib/isono/resource_manifest.rb", "lib/isono/runner/base.rb", "lib/isono/runner/cli.rb", "lib/isono/runner/rpc_server.rb", "lib/isono/serializer.rb", "lib/isono/thread_pool.rb", "lib/isono/util.rb", "lib/isono/version.rb", "spec/amqp_client_spec.rb", "spec/event_observable_spec.rb", "spec/file_channel_spec.rb", "spec/job_channel_spec.rb", "spec/logger_spec.rb", "spec/manifest_spec.rb", "spec/node_spec.rb", "spec/resource_loader_spec.rb", "spec/rpc_channel_spec.rb", "spec/spec_helper.rb", "spec/thread_pool_spec.rb", "spec/util_spec.rb", "tasks/load_resource_manifest.rake"]
+  s.authors = [%q{axsh Ltd.}, %q{Masahiro Fujiwara}]
+  s.date = %q{2011-09-20}
+  s.email = [%q{dev@axsh.net}, %q{m-fujiwara@axsh.net}]
+  s.executables = [%q{cli}]
+  s.files = [%q{.gitignore}, %q{LICENSE}, %q{NOTICE}, %q{Rakefile}, %q{bin/cli}, %q{isono.gemspec}, %q{lib/ext/shellwords.rb}, %q{lib/isono.rb}, %q{lib/isono/amqp_client.rb}, %q{lib/isono/daemonize.rb}, %q{lib/isono/event_delegate_context.rb}, %q{lib/isono/event_observable.rb}, %q{lib/isono/logger.rb}, %q{lib/isono/manifest.rb}, %q{lib/isono/messaging_client.rb}, %q{lib/isono/models/event_log.rb}, %q{lib/isono/models/job_state.rb}, %q{lib/isono/models/node_state.rb}, %q{lib/isono/models/resource_instance.rb}, %q{lib/isono/node.rb}, %q{lib/isono/node_modules/base.rb}, %q{lib/isono/node_modules/data_store.rb}, %q{lib/isono/node_modules/event_channel.rb}, %q{lib/isono/node_modules/event_logger.rb}, %q{lib/isono/node_modules/job_channel.rb}, %q{lib/isono/node_modules/job_collector.rb}, %q{lib/isono/node_modules/job_worker.rb}, %q{lib/isono/node_modules/node_collector.rb}, %q{lib/isono/node_modules/node_heartbeat.rb}, %q{lib/isono/node_modules/rpc_channel.rb}, %q{lib/isono/rack.rb}, %q{lib/isono/rack/builder.rb}, %q{lib/isono/rack/data_store.rb}, %q{lib/isono/rack/job.rb}, %q{lib/isono/rack/map.rb}, %q{lib/isono/rack/object_method.rb}, %q{lib/isono/rack/proc.rb}, %q{lib/isono/rack/thread_pass.rb}, %q{lib/isono/resource_manifest.rb}, %q{lib/isono/runner/base.rb}, %q{lib/isono/runner/cli.rb}, %q{lib/isono/runner/rpc_server.rb}, %q{lib/isono/serializer.rb}, %q{lib/isono/thread_pool.rb}, %q{lib/isono/util.rb}, %q{lib/isono/version.rb}, %q{spec/amqp_client_spec.rb}, %q{spec/event_observable_spec.rb}, %q{spec/file_channel_spec.rb}, %q{spec/job_channel_spec.rb}, %q{spec/logger_spec.rb}, %q{spec/manifest_spec.rb}, %q{spec/node_spec.rb}, %q{spec/resource_loader_spec.rb}, %q{spec/rpc_channel_spec.rb}, %q{spec/spec_helper.rb}, %q{spec/thread_pool_spec.rb}, %q{spec/util_spec.rb}, %q{tasks/load_resource_manifest.rake}]
   s.homepage = %q{http://github.com/axsh/isono}
-  s.require_paths = ["lib"]
+  s.require_paths = [%q{lib}]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
   s.rubyforge_project = %q{isono}
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Messaging and agent fabric}
 
   if s.respond_to? :specification_version then

data/lib/isono/node_modules/rpc_channel.rb

@@ -31,6 +31,7 @@ module Isono
           :per_sec_last_response_count=>0,
         }
         @endpoints = {}
+        @requested_endpoints = {}
         @amq = node.create_channel
         @amq.prefetch(config_section.receiver_prefetch_size.to_i)
         @amq.queue("command-recv.#{manifest.node_id}", {:exclusive=>true}).subscribe(:ack=>true) { |header, data|
@@ -265,6 +266,14 @@ module Isono
             @active_requests[req.ticket] = req
           end
 
+          # create receiver queue if it is requested at first time
+          # from this node. This allows that the receiver became ready
+          # after the sender can proceed the request.
+          if @requested_endpoints[req.endpoint].nil?
+            amq.queue(endpoint_queue_name(req.endpoint), {:exclusive=>false, :auto_delete=>true})
+            @requested_endpoints[req.endpoint] = 1
+          end
+
           amq.default_exchange.publish(Serializer.instance.marshal(req.request_hash),
                                        {:message_id => req.ticket,
                                          :key => endpoint_queue_name(req.endpoint),

data/lib/isono/rack/job.rb

@@ -19,6 +19,16 @@ module Rack
       def fail_cb(&blk)
         @job.fail_cb = blk
       end
+
+      # Job may run in asynchronous mode. So response() should not
+      # raise error even when it is called multiple times during session.
+      def response(msg)
+        if responded?
+          Job.logger.info("Defered response message from #{@job.job_id}: #{msg}")
+        else
+          super(msg)
+        end
+      end
     end
 
     class JobRequest < Request

data/lib/isono/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module Isono
-  VERSION='0.2.8'
+  VERSION='0.2.9'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: isono
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - axsh Ltd.
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 +09:00
-default_executable: cli
+date: 2011-09-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: amqp
@@ -181,7 +180,6 @@ files:
 - spec/thread_pool_spec.rb
 - spec/util_spec.rb
 - tasks/load_resource_manifest.rake
-has_rdoc: true
 homepage: http://github.com/axsh/isono
 licenses: []
 
@@ -213,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: isono
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Messaging and agent fabric