crap_server 0.0.4.2 → 0.0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8f32930965a763afe13876581ab27b27c5c4803
-  data.tar.gz: 29ae4fb42d5d261b4e2a4d4e48e3a38f2d5a6282
+  metadata.gz: 13e8f04ebe8da4fdb6e846e27fff6e7818f8d603
+  data.tar.gz: 760267e338c5e9a374f375ce7f87ebca81e1d284
 SHA512:
-  metadata.gz: fbb0d3e5004bdafdafffb4b9b6d72188f771e7976ef60d411bb394d30bc35cbe5c1fa059af2c1c09beea38ddee2642cd3400daf535a66ca7036fc28f6cd09c77
-  data.tar.gz: f7d46b54a5e050e13d7f664ccb1f6034a89c45891b287d2ebfffebbc3aa2f16916d54b7be6d2cfa14d2cf3b642cb7dbc20aea742108f554ab7f8c6143bf005bb
+  metadata.gz: cadc65e83f29aadbe922cc61627a4eed560822480b61589f502808405312c56123415faaf4370a8932541b57c37cdc3d54483c260d836a19eba6c89fb32ea8a8
+  data.tar.gz: db8560beea1798a34a85d886393d8da833edf69a1973e55404ba5194e7013c2807734970f7636d0d764a72df3044c4fdb04999e80015058a6b069f56efa6f8d9

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+# 0.0.5
+
+* Fixed a bug that prevent to close lasts connections until get a new connection.
+* Refactoring some code.

data/lib/crap_server/application.rb

@@ -80,45 +80,31 @@ module CrapServer
       def start_ipv6_socket
         # :INET6 is to open an IPv6 connection
         # :STREAM is to open a TCP socket
-        # After this line, the app is not yet ready to work, we only opened a socket
-        socket_ipv6 = Socket.new(:INET6, :STREAM)
-
-        begin
-          # Now, bind the port.
-          # ::1 is loopback for IPv6
-          socket_ipv6.bind(Socket.pack_sockaddr_in(config.port, '::1'))
-        rescue Errno::EADDRINUSE
-          socket_ipv6.close
-          raise ConnectionError.new "Unable to bind #{config.port} port."
-        end
-        socket_ipv6.listen(config.max_pending_connections)
-        # Tell to the Kernel that is ok to rebind the port if is in TIME_WAIT state (after close the connection
-        # and the Kernel wait for client acknowledgement)
-        socket_ipv6.setsockopt(:SOCKET, :REUSEADDR, true)
-
-        @socket6 = socket_ipv6
+        @socket6 = start_socket :INET6, :STREAM, '::1'
       end
 
       def start_ipv4_socket
-        # :INET6 is to open an IPv6 connection
+        # :INET is to open an IPv4 connection
         # :STREAM is to open a TCP socket
-        # After this line, the app is not yet ready to work, we only opened a socket
-        socket_ipv4 = Socket.new(:INET, :STREAM)
+        @socket4 = start_socket :INET, :STREAM, '0.0.0.0'
+      end
+
+      def start_socket(version, type, loopback)
+        socket = Socket.new(version, type)
 
         begin
           # Now, bind the port.
-          socket_ipv4.bind(Socket.pack_sockaddr_in(config.port, '0.0.0.0'))
+          socket.bind(Socket.pack_sockaddr_in(config.port, loopback))
         rescue Errno::EADDRINUSE
-          socket_ipv4.close
+          socket.close
           raise ConnectionError.new "Unable to bind #{config.port} port."
         end
 
-        socket_ipv4.listen(config.max_pending_connections)
+        socket.listen(config.max_pending_connections)
         # Tell to the Kernel that is ok to rebind the port if is in TIME_WAIT state (after close the connection
         # and the Kernel wait for client acknowledgement)
-        socket_ipv4.setsockopt(:SOCKET, :REUSEADDR, true)
-
-        @socket4 = socket_ipv4
+        socket.setsockopt(:SOCKET, :REUSEADDR, true)
+        socket
       end
 
       def socket_ipv6

data/lib/crap_server/connection_handler.rb

@@ -101,61 +101,87 @@ module CrapServer
     protected
 
     # Evented loop (Reactor pattern)
-    def accept_loop
+    def accept_loop(&block)
       loop {
+        logger.debug 'Start loop'
         @readables,  @writables = IO.select(to_read, to_write)
 
-        @readables.each do |socket|
-          if @sockets.include? socket
-            io, addr = socket.accept
-            set_address io, addr
-            set_close_after_write io if config.auto_close_connection
-            # Disabling Nagle's algorithm. Is fucking slow :P
-            io.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-            # We add him to the read queue
-            add_to_read io
-          else
-            begin
-              _, data = socket, socket.read_nonblock(config.read_buffer_size)
-              yield data, socket, address(socket)
-              # We close the connection if we auto_close_connection is true and the user didn't write in the buffer.
-              close socket if config.auto_close_connection && buffer(socket).nil?
-            rescue Errno::EAGAIN
-            rescue EOFError
-              remove_to_read socket
-            end
+        process_readables &block
+        process_writables
+      }
+    end
+
+    protected
+
+    def process_readables(&block)
+      @readables.each do |socket|
+        if @sockets.include? socket
+          accept_connection socket
+        else
+          begin
+            read_and_process_data socket, &block
+          rescue Errno::EAGAIN
+          rescue EOFError
+            remove_to_read socket
           end
         end
+      end
+    end
 
-        @writables.each do |socket|
-          begin
-            string = buffer socket
-            bytes = socket.write_nonblock string
-            string.slice! 0, bytes
-            if string.empty?
-              # If we don't have more data to send to the client
-              if close_after_write socket
-                close socket
-              else
-                remove_to_write socket
-              end
-            else
-              set_buffer socket, string
-              remove_to_read socket
-            end
-          # If the client close the connection, we remove is from read and from write
-          rescue Errno::ECONNRESET, Errno::EPIPE
+    def process_writables
+      @writables.each do |socket|
+        begin
+          string = buffer socket
+          bytes = socket.write_nonblock string
+          string.slice! 0, bytes
+          if string.empty?
+            # If we don't have more data to send to the client
             if close_after_write socket
               close socket
+            else
+              remove_to_write socket
             end
+          else
+            set_buffer socket, string
+            remove_to_read socket
+          end
+        # If the client close the connection, we remove is from read and from write
+        rescue Errno::ECONNRESET, Errno::EPIPE
+          if close_after_write socket
+            close socket
           end
         end
-      }
+      end
+    end
+
+    def accept_connection(socket)
+      begin
+        io, addr = socket.accept_nonblock
+        set_address io, addr
+        set_close_after_write io if config.auto_close_connection
+        # Disabling Nagle's algorithm. Is fucking slow :P
+        io.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+        # We add him to the read queue
+        add_to_read io
+      rescue Errno::EINPROGRESS, IO::EAGAINWaitReadable
+      end
+    end
+
+    def read_and_process_data(socket, &block)
+      _, data = socket, socket.read_nonblock(config.read_buffer_size)
+      block.call data, socket, address(socket)
+      # We close the connection if we auto_close_connection is true and the user didn't write in the buffer.
+      if config.auto_close_connection && buffer(socket).nil?
+        close socket
+      end
     end
 
-    protected
     def config
       CrapServer::Application.send(:config)
     end
+
+    def logger
+      CrapServer::Application.send(:logger)
+    end
   end
 end

data/lib/crap_server/forker.rb

@@ -41,7 +41,6 @@ module CrapServer
     def spawn_child
       fork do
         begin
-
           CrapServer::Application.send(:per_process_block).call if not CrapServer::Application.send(:per_process_block).nil?
           pool = CrapServer::ThreadPool.new @sockets
           pool.run &@block_proc

data/lib/crap_server/version.rb

@@ -1,3 +1,3 @@
 module CrapServer
-  VERSION = '0.0.4.2'
+  VERSION = '0.0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crap_server
 version: !ruby/object:Gem::Version
-  version: 0.0.4.2
+  version: 0.0.5.0
 platform: ruby
 authors:
 - Andres Jose Borek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,6 +47,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md