elrpc 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0842836d2200968a4a098eda7ba03664cce8aa7
-  data.tar.gz: 53583612a724a0570cd9e072d6401bd3e4d560b7
+  metadata.gz: f891bac71044cc7a7eb77f745da3318981f68f17
+  data.tar.gz: 0ad1e5a241187431b3c428e547df86f77e7a6ff5
 SHA512:
-  metadata.gz: 58e64d2116678181e6ae2880ea22050714c26c711deac3e5e896132a901612e3afe234d43168e0d52128ea7fba3e8e9b1e482d8046ca7e09a8e5f92ef5216af5
-  data.tar.gz: 39465ff5784968f8495f53329dac6eb393cb408417008c1e02ed365771a3e7bc77d21a98b4b8c3001e72fe5063e9325cabc5c1514a4c546018c11f356bb6dfec
+  metadata.gz: dd8e7eb9fddef97c449441f183a3c4db452416ac748f2ab6389838530b72149ba930f8e56c6c9a2a9249c06a253e7cec9049a41fddebce08173298c523649e83
+  data.tar.gz: fb851ee98b9597cdc4df267cac633918ecce636a4304a2f24448894f544e800977ad9d0d39372a3a4cbc3335a03f595be82f8c03cd67ff625149c4b553ae72a9

data/lib/elrpc.rb

@@ -106,6 +106,10 @@ module Elrpc
       @client = Elrpc.start_client(@port)
       return self
     end
+
+    def alive?
+      @client.alive?
+    end
     
     def register_method(method)
       @client.register_method(method)
@@ -317,6 +321,10 @@ module Elrpc
       @logger.debug ":ready for I/O stream."
     end
 
+    def alive?
+      return @socket_state == :socket_opened
+    end
+
     # 自分にメソッドを登録する
     def register_method(method)
       @methods[method.name] = method
@@ -330,6 +338,7 @@ module Elrpc
     # 相手のメソッドを呼ぶ
     # block(err, value)
     def call_method_async(name, *args, &block)
+      return _raise_connection_error(block) if @socket_state != :socket_opened
       uid = Elrpc.gen_uid
       msg = CallMessage.new(uid, name, args, block)
       # ここは競合しないのでロックしない
@@ -338,6 +347,13 @@ module Elrpc
       uid
     end
 
+    def _raise_connection_error(block)
+      job = lambda do
+        block.call(EPCStackError.new("ConnectionClosed","Connection closed",""))
+      end
+      @worker_pool.invoke(job)
+    end
+
     # 相手のメソッドを呼ぶ（同期版）
     def call_method(name, *args)
       mutex = Mutex.new
@@ -363,6 +379,7 @@ module Elrpc
     # 接続相手のメソッド一覧を返す
     # [[name, argdoc, docstring], ...]
     def query_methods_async(&block)
+      return _raise_connection_error(block) if @socket_state != :socket_opened
       uid = Elrpc.gen_uid
       msg = MethodsMessage.new(uid, block)
       @session[uid] = msg
@@ -403,7 +420,7 @@ module Elrpc
         @sender_thread.join(4) unless Thread.current == @sender_thread
         @receiver_thread.join(4) unless Thread.current == @receiver_thread
         _clear_waiting_sessions
-        @socket_state = :scoket_not_connected
+        @socket_state = :socket_not_connected
       end
       _wakeup
       @logger.debug "RPCService.stop: completed"
@@ -430,7 +447,7 @@ module Elrpc
     def _clear_waiting_sessions
       @session_lock.synchronize do
         @session.keys.each do |uid|
-          _session_return(uid, "EPC Connection closed", nil)
+          _session_return(uid, EPCStackError.new("ConnectionClosed","EPC Connection closed",""), nil)
         end
       end
     end
@@ -520,6 +537,7 @@ module Elrpc
 		  lenstr = @socket.read(6)
           if lenstr.nil? then
             @logger.debug "[rcvloop] Socket closed!"
+            @socket_state = :socket_not_connected
             break
           end
           len = lenstr.to_i(16)
@@ -527,6 +545,7 @@ module Elrpc
           body = @socket.read(len) # 1 means LF
           if body.nil? then
             @logger.debug "[rcvloop] Socket closed!"
+            @socket_state = :socket_not_connected
             break
           end
           body.force_encoding("utf-8")
@@ -584,6 +603,7 @@ module Elrpc
         uid = nil
 	  end # loop
       @logger.debug "[receiver-thread] loop exit : #{@socket_state}"
+      _clear_waiting_sessions
       _wakeup
       @logger.debug "[receiver-thread exit]--------------"
     end

data/lib/elrpc/version.rb

@@ -1,3 +1,3 @@
 module Elrpc
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/_errors.rb

@@ -12,4 +12,7 @@ end
 server.def_method "echo" do |*arg|
   arg
 end
+server.def_method "killme" do |*arg|
+  exit
+end
 server.wait

data/test/test-epc.rb

@@ -55,6 +55,7 @@ class TestEPC < Test::Unit::TestCase
       thread = Thread.start { loop { puts io.readline } }
       client = Elrpc.start_client(port)
       client.logger.level = Logger::ERROR
+      #client.logger.level = Logger::DEBUG
       begin
         yield client
       rescue => e
@@ -118,7 +119,7 @@ class TestEPC < Test::Unit::TestCase
       end
     end
   end
-
+ 
   sub_test_case "04 Errors" do
 
     test "Error sync" do
@@ -126,7 +127,7 @@ class TestEPC < Test::Unit::TestCase
         assert_raise_message /divided by 0/ do
           ret = client.call_method("num_error")
         end
-        assert_raise_message /Raise!/ do
+        assert_raise_message /Raise/ do
           ret = client.call_method("raise_error")
         end
         ret = client.call_method("echo", "recover!!")
@@ -160,6 +161,18 @@ class TestEPC < Test::Unit::TestCase
       end
     end
 
+    test "EPC Down" do
+      with_epc "_errors.rb" do |client|
+        assert_raise_kind_of Elrpc::EPCStackError do
+          client.call_method("killme")
+        end
+        assert_raise_kind_of Elrpc::EPCStackError do
+          client.call_method("echo", "die?" )
+        end
+        assert_equal false, client.alive?
+      end
+    end
+    
   end
 
   sub_test_case "05 Query" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elrpc
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - SAKURAI Masashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elparser