bogo-websocket 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f654e8174cba3c2e7f53e4a1b6614253042fa8a1
-  data.tar.gz: 90a4dad66c9712479a844cd3bed23774636deeae
+  metadata.gz: 21011f628e8dad6781507d7700bc567e5684efc7
+  data.tar.gz: f96c39374cf0d024e38039ec52472ed8ff08338e
 SHA512:
-  metadata.gz: 144ce085ffc83667241f70077e2d713b1f6d230a2f4d586745c4b60890160807821cb1f5c1aacfdc6a34e7457867d29d04c877bea5c2f31c22984cc31e765e51
-  data.tar.gz: c1e6d8827ccbd0cc305d24dce6f0def5bbba14e065d2409a31439e0a92e119eacc6c7621ea5b352f7cfde19d47d5316435ed14d151a720e29c24f9a8cc2b9bee
+  metadata.gz: 8bf34984efe86f08d81c6368464bcc9f4ff6a0405da1fbcf067284342f75343f634aec87626cc4554eebeddd041866bdc97ecca3a025114d3edc3b59c5e3a354
+  data.tar.gz: 7da091f8504803209e7c34c1b1f6d7e08fe2c270c445e24e01d8a07ecc5db9965ed773dfd76fa91389ba65f6d9012c82f1ad05d7590736a237151d2177a7bd63

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.0
+* Reduce valid exceptions for retry
+* Consistently close down socket
+
 # v0.1.4
 * Rescue connection resets and close gracefully
 

data/lib/bogo-websocket/version.rb

@@ -1,5 +1,5 @@
 module Bogo
   module Websocket
-    VERSION = Gem::Version.new('0.1.4')
+    VERSION = Gem::Version.new('0.2.0')
   end
 end

data/lib/bogo-websocket/websocket.rb

@@ -61,10 +61,13 @@ module Bogo
 
       # Close the connection
       def close
-        connection.close
-        @die = true
-        control_w.write 'closed'
-        container.join
+        if(connection)
+          connection.close
+          @die = true
+          control_w.write 'closed'
+          container.join unless Thread.current == container
+          @connection = nil
+        end
       end
 
       # Start the reader
@@ -74,22 +77,21 @@ module Bogo
             until(die || connection.closed?)
               begin
                 unless(die || connection.closed?)
-                  client << connection.read_nonblock(2046)
+                  client << connection.read_nonblock(1024)
                   if(message = client.next)
                     handle_message(message)
                   end
                 end
-              rescue IO::WaitReadable, EOFError, Errno::ECONNRESET
+              rescue IO::WaitReadable, Errno::EAGAIN => e
                 unless(die || connection.closed?)
                   IO.select([connection, control_r])
                   retry
                 end
               rescue => error
                 on_error.call(error)
-                raise
+                close
               end
             end
-            @connection = nil
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bogo-websocket
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo
@@ -97,3 +97,4 @@ signing_key:
 specification_version: 4
 summary: Simple websocket libraries
 test_files: []
+has_rdoc: