crap_server 0.0.2 → 0.0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eedef645e51d16d796efdd9893f69809adce20d0
-  data.tar.gz: e220bbd8a3878f29037216942fb3cc00ba5d4e60
+  metadata.gz: fec671da6d4ad0911a4471409620d7fb6de1d25b
+  data.tar.gz: 18b77248eb31818771cf374ba71b6bac2d6db5c6
 SHA512:
-  metadata.gz: f2e78629c99e7564e0352f3a754623b7108e84ed9f695ce7f5f12e9f1c0ab1829830223f2f16aa43b343ed0423e8eb37f1f3e046a5939ba5bf48ffef88630163
-  data.tar.gz: 167fcab8bc1047971cee75ad00de1e0297b245e455de3210ce7a3dce0e8b032df6a0e94143a9ee49f1d5bd8a9e2b57418ab765164838228970e51edc7aa1336b
+  metadata.gz: 0468c1a3e10ec024543ad56a5d8a948a0b6313e0d58e7a9e780d099787ccf1cbd33e10f771cf31b0c0fd08539df033cb837186556ed8d687d87fd3072ce37af7
+  data.tar.gz: 12fd50db239ae0fdc63ff31086baaeece7cfbb96798cc1c6b8b488069fc8a120a790b8eaf47b8d96977da42941117ffa9db04ae7487eaaeca23e9b5a9f5bb86e

data/README.md

@@ -1,11 +1,12 @@
 # CrapServer
+[![Code Climate](https://codeclimate.com/github/anga/crap_server/badges/gpa.svg)](https://codeclimate.com/github/anga/crap_server)
 
-Really thin a non intuitive ruby server and framework. Made to be fast and ready for really heavy servers (not only http server).
+Really thin and non intuitive ruby server and framework. Made to be fast and ready for really heavy servers (not only http server).
 
 # Another one?
 
 Yes. Why? because 2 main reasons. First, this is not a HTTP Web server, this is a generic server that can be used for any kind of TCP Socket server.
-Second and most important, because if funny :)
+Second and most important, because is funny :)
 
 ## Installation
 
@@ -49,11 +50,11 @@ ruby my_app.rb
 
 # Production ready?
 
-No. At the moment is only a thin server that abstract you from TCP sockets works.
+No. At the moment it's only a thin server that abstract you from TCP sockets works.
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/crap_server/fork )
+1. Fork it ( https://github.com/anga/crap_server/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/crap_server.gemspec

@@ -4,21 +4,22 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'crap_server/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "crap_server"
+  spec.name          = 'crap_server'
   spec.version       = CrapServer::VERSION
-  spec.authors       = ["Andres Joser Borek"]
-  spec.email         = ["andres.b.dev@gmail.com"]
+  spec.authors       = ['Andres Joser Borek']
+  spec.email         = ['andres.b.dev@gmail.com']
   spec.summary       = %q{Really thin a non intuitive ruby server and framework.}
-  spec.description   = %q{Really thin a non intuitive ruby server and framework. Made to be fast and ready for really heavy servers (not only http server).}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.description   = %q{Really thin and non intuitive ruby server and framework. Made to be fast and ready for really heavy servers (not only http server).}
+  spec.homepage      = 'https://rubygems.org/gems/crap_server'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.required_ruby_version = '>= 1.9.2'
+  spec.add_development_dependency 'bundler', '~> 1.6'
   # celluloid is for future use. Right now is not used
   # spec.add_dependency "celluloid", '~> 0.15.2'
 end

data/lib/crap_server/application.rb

@@ -25,31 +25,39 @@ module CrapServer
       # Main method. This setup all the connections and make the logic of the app
       def run!(&block)
 
-        # Bup the maximum opened file to the maximum allowed by the system
-        Process.setrlimit(:NOFILE, Process.getrlimit(:NOFILE)[1])
+        begin
+          # Bup the maximum opened file to the maximum allowed by the system
+          Process.setrlimit(:NOFILE, Process.getrlimit(:NOFILE)[1])
 
-        # Start IPv4 and IPv6 connection for the current port
-        open_connections
+          # Start IPv4 and IPv6 connection for the current port
+          open_connections
 
 
-        # Some log info to the user :)
-        logger.info 'Initializing Crap Server'
-        logger.info "Listening 0.0.0.0:#{config.port}"
-        logger.debug "Maximum allowed waiting connections: #{Socket::SOMAXCONN}"
-        logger.debug "Maximum number of allowed connections: #{Process.getrlimit(:NOFILE)[1]}" # Same as maximum of opened files
-        logger.info ''
+          # Some log info to the user :)
+          logger.info 'Initializing Crap Server'
+          logger.info "Listening 0.0.0.0:#{config.port}"
+          logger.debug "Maximum allowed waiting connections: #{Socket::SOMAXCONN}"
+          logger.debug "Maximum number of allowed connections: #{Process.getrlimit(:NOFILE)[1]}" # Same as maximum of opened files
+          logger.info ''
 
-        # The main loop. Listening IPv4 and IPv6 connections
-        Socket.accept_loop([socket_ipv4, socket_ipv6]) do |remote_socket, address_info|
-          connection_loop(remote_socket, address_info, &block)
-        end
+          # The main loop. Listening IPv4 and IPv6 connections
+          Socket.accept_loop([socket_ipv4, socket_ipv6]) do |remote_socket, address_info|
+            connection_loop(remote_socket, address_info, &block)
+          end
+
+          close_connections
 
-        close_connections
-      # If any kind of error happens, we MUST close the sockets
-      rescue => e
-        close_connections
+        # If any kind of error happens, we MUST close the sockets
+        rescue => e
+          logger.error "Error: #{e.message}"
+          e.backtrace.each do |line|
+            logger.error line
+          end
+          close_connections
 
-        raise e
+        rescue Interrupt
+          close_connections
+        end
       end
 
       protected
@@ -94,6 +102,8 @@ module CrapServer
 
       # Close all the sockets.
       def close_connections
+        logger.debug 'Closing all connections.'
+        logger.debug 'Bye!'
         # If any kind of error happens, we MUST close the sockets
         if socket_ipv4
           # Shuts down communication on all copies of the connection.
@@ -144,8 +154,6 @@ module CrapServer
           raise ConnectionError.new "Unable to bind #{config.port} port."
         end
 
-        puts "config: #{config.manual_read}"
-
         socket_ipv4.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)

data/lib/crap_server/configure.rb

@@ -32,7 +32,7 @@ module CrapServer
       @manual_read = false
       @read_buffer_size = 1024*16 # 16K for read buffer
       @max_pending_connections = Socket::SOMAXCONN
-      @method = :partial
+      @method = :non_blocking
       @auto_close_connection = true
       @log_file = STDOUT
       @log_level = Logger::DEBUG

data/lib/crap_server/connection_instance.rb

@@ -40,13 +40,18 @@ module CrapServer
     protected
     # Read the data from the socket
     def read_data
-      # Read the data from the socket
-      if @method == :normal
-        @socket.read(config.read_buffer_size)
-      elsif @method == :partial
-        @socket.readpartial(config.read_buffer_size)
-      elsif  @method == :non_blocking
-        @socket.read_nonblock(config.read_buffer_size)
+      begin
+        # Read the data from the socket
+        if @method == :normal
+          @socket.read(config.read_buffer_size)
+        elsif @method == :partial
+          @socket.readpartial(config.read_buffer_size)
+        elsif  @method == :non_blocking
+          @socket.read_nonblock(config.read_buffer_size)
+        end
+      rescue Errno::EAGAIN
+        IO.select([connection])
+        retry
       end
     end
   end

data/lib/crap_server/version.rb

@@ -1,3 +1,3 @@
 module CrapServer
-  VERSION = "0.0.2"
+  VERSION = '0.0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crap_server
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.2.1
 platform: ruby
 authors:
 - Andres Joser Borek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,7 +24,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-description: Really thin a non intuitive ruby server and framework. Made to be fast
+description: Really thin and non intuitive ruby server and framework. Made to be fast
   and ready for really heavy servers (not only http server).
 email:
 - andres.b.dev@gmail.com
@@ -44,7 +44,7 @@ files:
 - lib/crap_server/connection_instance.rb
 - lib/crap_server/helpers/socket_reader.rb
 - lib/crap_server/version.rb
-homepage: ''
+homepage: https://rubygems.org/gems/crap_server
 licenses:
 - MIT
 metadata: {}
@@ -56,7 +56,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="