isono 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e391d773178beebfa4cdf0598a13c124503b6a6
-  data.tar.gz: 49f3936da23b3b20b240872da2fc726b93f973e4
+  metadata.gz: 1e666f9b342338026fe08b4880bf74dfb60673f8
+  data.tar.gz: a1127479b2ad3c83acff866011b1eaee1286907e
 SHA512:
-  metadata.gz: 1d833c4e1f3c140eb2ef10c4bb6d558fb331fad5a10dc713b2767cd5875604fceb67189f0aaf9cedafdd20384128ee5503ca5c8960828f6bbb11f19f1981e858
-  data.tar.gz: 7fb2a1785b15a094ad935f523b35efb442351ae720b2e4ba8aa595c96355a77660e0c99bd9c164234197fc220fcfd88d2688c04fd74ac4160741d1fb8dc45356
+  metadata.gz: 6271d86c5ec057bf267a3bc4322f19fdc83187d9ae1635691757a878688a66c67fa2a00d099cf9c3d7347feecd8e7ba99c3caec1d3f8522c76226a8f8af0a79c
+  data.tar.gz: 7ce671336b7e6bb8db77aaa8782445ce15ba1920f90ece1ce7cdf5edde5374697f0080995b9df0df64756bd7b4a42f8e0351e8d40f24da87276f0f282f864461

data/isono.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "isono"
-  s.version = "0.2.19"
+  s.version = "0.2.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["axsh Ltd.", "Masahiro Fujiwara"]

data/lib/isono/node_modules/rpc_channel.rb

@@ -105,7 +105,7 @@ module Isono
       attr_reader :amq
 
       # Make a RPC request to an endpoint.
-      # 
+      #
       # @param [String] endpoint
       # @param [String] command
       # @param [Array] args
@@ -125,7 +125,7 @@ module Isono
       #   }
       #
       # @example setup request context and do wait().
-      #   Note that callbacks are 
+      #   Note that callbacks are
       #   rpc.request('endpoint1', 'func1', xxxx) { |req|
       #     # send new attribute
       #     req.request[:xxxx] = "sdfsdf"
@@ -133,7 +133,7 @@ module Isono
       #     req.synchronize
       #   }.wait # request() get back the altered RequestCotenxt that has wait().
       #
-      # @example Create async oneshot call. (do not expect response) 
+      # @example Create async oneshot call. (do not expect response)
       #   rpc.request('endpoint1', 'func1') { |req|
       #     req.oneshot = true
       #   }
@@ -141,7 +141,7 @@ module Isono
         req = RequestContext.new(endpoint, command, args)
         # the block is to setup the request context prior to sending.
         if blk
-          # async 
+          # async
           r = blk.call(req)
           req = r if r.is_a?(RequestContext)
           send_request(req)
@@ -165,7 +165,7 @@ module Isono
       def register_endpoint(endpoint, app, opts={})
         raise TypeError unless app.respond_to?(:call)
         opts = {:exclusive=>true, :prefetch=>1}.merge(opts)
-        
+
         # create receive queue for new RPC endpoint.
         endpoint_proc = proc { |header, data|
 
@@ -188,7 +188,7 @@ module Isono
           end
         }
 
-        
+
         EventMachine.schedule {
           ch = node.create_channel
 
@@ -215,7 +215,7 @@ module Isono
       end
 
       # Unregister endpoint.
-      # 
+      #
       # @param [String] endpoint endpoint name to be removed
       def unregister_endpoint(endpoint)
         if @endpoints.has_key?(endpoint)
@@ -228,7 +228,7 @@ module Isono
           }
         end
       end
-      
+
       private
       def endpoint_queue_name(ns)
         "isono.rpc.endpoint.#{ns}"
@@ -253,9 +253,9 @@ module Isono
           # set default timeout if no one updated the initial value.
           req.timeout_sec = config_section.timeout_sec
         end
-                
+
         req.process_event(:on_ready)
-        
+
         EventMachine.schedule {
           @stats[:total_request_count] += 1
           if @stats[:peak_wait_response_size] < @active_requests.size
@@ -281,7 +281,7 @@ module Isono
 
       class ResponseContext
         attr_reader :header
-        
+
         def initialize(exchange, header)
           @responded = false
           @exchange = exchange
@@ -342,6 +342,8 @@ module Isono
         attr_reader :error_cb, :success_cb, :progress_cb
         attr_reader :state
 
+        include Isono::Logger
+
         def initialize(endpoint, command, args)
           super({:request=>{
                     :endpoint=> endpoint,
@@ -355,7 +357,7 @@ module Isono
                   :completed_at => nil,
                   :complete_status => nil,
                 })
-          
+
           @success_cb = nil
           @progress_cb = nil
           @error_cb = nil
@@ -432,10 +434,11 @@ module Isono
         module RequestSynchronize
           def self.extended(mod)
             raise TypeError, "This module is applicable only for RequestContext" unless mod.is_a?(RequestContext)
+
             # overwrite callbacks
             mod.instance_eval {
               @q = ::Queue.new
-              
+
               on_success { |r|
                 @q << [:success, r]
               }
@@ -447,11 +450,15 @@ module Isono
 
           public
           def wait()
-            raise "response was received already." if state == :done
             raise "wait() has to be called at outside of the EventMachine's main loop." if EventMachine.reactor_thread?
-            
+            if state == :done && @q.empty?
+              logger.warn "Remote procedure call state is 'done' and response queue is empty. " +
+                          "May be waiting forever for a response. Endpoint: '%s' Command: '%s'" %
+                          [endpoint, command]
+            end
+
             r = @q.deq
-            
+
             case r[0]
             when :success
               r[1]
@@ -460,9 +467,9 @@ module Isono
             end
           end
         end
-        
+
       end
-      
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isono
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - axsh Ltd.