p2p2 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7e54c524dd9a75718253d921b5ce39ffa471c29a5dc15244af6a68d4ae3a314
-  data.tar.gz: c4f4e30364b670cc8c160ab577ff75b83259bc002bb4029c7e410c322600c666
+  metadata.gz: d6f2cc3e01ad7ec77c39871c38605d463def1e2bae20bc861ca8dbf90cc39c57
+  data.tar.gz: a7496d3078b8ba0433b66c8ead4ac4f89464f9cbfc800c70ec476b70b6cd490c
 SHA512:
-  metadata.gz: 892b4fc7202ccf1a9e5a3d473808dcbd55b6f8156dd1ef32253ac53aba1f49552939f787a9be8e7e425947c7b13b7a499289afee0050ed1cf142db19da875023
-  data.tar.gz: 6ff618b73ea3abd48df2df15a52f7b94d01658bb7bf913a6b861685d0e140116dc7b7525eb4eb6fc1ec6f0af85e8309b3afaf25af98094ce9f1563e92ab08663
+  metadata.gz: 9dbeb5e2d226794a9a1d83a234bb0eda5cff11106029579ebd0a13703e67ed9791d946c76402174a0dfe1101625cbd3ceeb31e256a9126cd18c58a62dac5baf3
+  data.tar.gz: eb62e94f286de5f64aa03a34eb88fd9eda618aae1c75c24496d7d8158e23cb05db3400a0a7940d74d45878676240702ea55e0002b4eb4d4974931e4c40ade55c

data/lib/p2p2/p1.rb

@@ -120,16 +120,17 @@ module P2p2
         data = room.read_nonblock( PACK_SIZE )
       rescue IO::WaitReadable, Errno::EINTR, IO::WaitWritable
         return
-      rescue Errno::ECONNREFUSED, EOFError, Errno::ECONNRESET => e
+      rescue Errno::ECONNREFUSED, Errno::ECONNRESET => e
+        puts "read room #{ e.class } #{ Time.new }"
+        raise e if @reconn_room_times >= REROOM_LIMIT
+        @reconn_room_times += 1
+        sleep 5
+        add_closing( room )
+        return
+      rescue EOFError => e
         puts "read room #{ e.class } #{ Time.new }"
-
-        if @reconn_room_times >= REROOM_LIMIT
-          raise e
-        end
-
         sleep 5
         add_closing( room )
-        @reconn_room_times += 1
         return
       end
 

data/lib/p2p2/p2.rb

@@ -191,16 +191,17 @@ module P2p2
         data = room.read_nonblock( PACK_SIZE )
       rescue IO::WaitReadable, Errno::EINTR, IO::WaitWritable
         return
-      rescue Errno::ECONNREFUSED, EOFError, Errno::ECONNRESET => e
+      rescue Errno::ECONNREFUSED, Errno::ECONNRESET => e
+        puts "read room #{ e.class } #{ Time.new }"
+        raise e if @app_info[ :reconn_room_times ] >= REROOM_LIMIT
+        @app_info[ :reconn_room_times ] += 1
+        sleep 5
+        add_closing( room )
+        return
+      rescue EOFError => e
         puts "read room #{ e.class } #{ Time.new }"
-
-        if @app_info[ :reconn_room_times ] >= REROOM_LIMIT
-          raise e
-        end
-
         sleep 5
         add_closing( room )
-        @app_info[ :reconn_room_times ] += 1
         return
       end
 

data/lib/p2p2/version.rb

@@ -1,3 +1,3 @@
 module P2p2
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p2p2
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies: []
 description: 内网里的任意应用，访问另一个内网里的应用服务端。
 email: