crap_server 0.0.4.0 → 0.0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09f1212512d245febe72024ad1751b4720dbba32
-  data.tar.gz: 689ad5316946fbc2a52c48e7fe3b186458d9be27
+  metadata.gz: 153311cb4783062e2a2ff30c82bde05b90eabd31
+  data.tar.gz: c1b552c709961e5673f398f285e89d27e3767a4d
 SHA512:
-  metadata.gz: e7888fd1485a6b2c06ade746640b6a94860a25ca099c1cebf0ffb4ea1e48d03dfab1ab2e2ab8b078100e240bc982dac7f37c4c9f79275b853acb0d1d526eff42
-  data.tar.gz: e88ea89e7fd1c7b6185f695d61736af723a2707abef6e638d34377acb242e00f93dc5827095e8239522854762105aebcead9785b4d167ae3786a4a86ee8044f4
+  metadata.gz: 88a68cec8ed174dd4dcbffd60e84ab78d24cd1d34d6f5c4e54d62ff60ae4b3e046b84edd311fac55326a792c49a35c089ceae253de68695c9ce3c2faae754a99
+  data.tar.gz: 047d1427c76f4e6d5a82deaea1f0471231eefb2ebf315d83d59333b2339e7a6a1fdb815d7e44a218231d51b6d2523e6951dd838da51c02d9c831dc27a4c084b0

data/lib/crap_server/application.rb

@@ -25,6 +25,7 @@ module CrapServer
       # Main method. This setup all the connections and make the logic of the app
       def run!(&block)
         begin
+          logger.info 'Initializing Crap Server'
           # Bup the maximum opened file to the maximum allowed by the system
           Process.setrlimit(:NOFILE, Process.getrlimit(:NOFILE)[1])
 
@@ -33,10 +34,11 @@ module CrapServer
 
 
           # 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.debug "Number of threads per core: #{config.pool_size}"
+          logger.info 'Everything is ready. Have fun!'
           logger.info ''
 
           # Prefork and handle the connections in each process.
@@ -44,19 +46,18 @@ module CrapServer
           # Run loop. (basically, waiting until Ctrl+C)
           forker.run &block
 
-          # NOTE: I think this line never will be executed
-          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
+        # We don't need to close the socket, because are closed automatically by ruby
 
         rescue Interrupt
-          close_connections
+          # We don't need to close the socket, because are closed automatically by ruby
+          # Leaved in black only to prevent error backtrace.
+          # The process are killed by CrapServer::Forker
         end
       end
 
@@ -68,25 +69,6 @@ module CrapServer
         start_ipv6_socket
       end
 
-      # 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.
-          # socket_ipv4.shutdown
-          # socket_ipv4.close
-        end
-
-        if socket_ipv6
-          # Shuts down communication on all copies of the connection.
-          # socket_ipv6.shutdown
-          # socket_ipv6.close
-        end
-        # TODO: Close all opened sockets connections from other threads and processes
-      end
-
       def start_ipv6_socket
         # :INET6 is to open an IPv6 connection
         # :STREAM is to open a TCP socket
@@ -147,11 +129,6 @@ module CrapServer
         @socket4 = value
       end
 
-      # TCP Socket reader
-      def reader(socket)
-
-      end
-
       # Main configuration.
       # See Crap::Configure
       def config

data/lib/crap_server/forker.rb

@@ -10,24 +10,20 @@ module CrapServer
     def run(&block)
       begin
         @block_proc = block
-        child_pids = []
+        @child_pids = []
         processor_count.times do
-          child_pids << spawn_child
+          @child_pids << spawn_child
         end
 
-        # We take care of our children. If someone kill one, me made another one.
-        # PS: Is a hard work :P
-        loop do
-          pid = Process.wait
-          child_pids.delete(pid)
-          child_pids << spawn_child
-        end
+        check_children
       # If someone kill us, we kill our children. Yes, is sad, but we must do it :'(
-      rescue Interrupt
-        child_pids.each do |cpid|
+      rescue ::Exception # If any kind of error happens, we must kill our children
+        @child_pids.each do |cpid|
           begin
             # We send Ctrl+C to the process
             Process.kill(:INT, cpid)
+          # If the process in not running or because any reason we have no privileges to kill him
+          # We just only don't care. In any case, we can do nothing
           rescue Errno::ESRCH
           end
         end
@@ -36,12 +32,12 @@ module CrapServer
           socket.shutdown
           socket.close
         end
-
       end
     end
 
     protected
 
+    # Spawn a new Thread Pool in each process
     def spawn_child
       fork do
         begin
@@ -52,6 +48,17 @@ module CrapServer
       end
     end
 
+    # The main loop that check if any process is killed. If one of them get killed, we spawn another one.
+    def check_children
+      # We take care of our children. If someone kill one, me made another one.
+      # PS: Is a hard work :P
+      loop do
+        pid = Process.wait
+        @child_pids.delete(pid)
+        @child_pids << spawn_child
+      end
+    end
+
     # Extracted from https://github.com/grosser/parallel/blob/master/lib/parallel.rb
     # Number of processors seen by the OS and used for process scheduling.
     #

data/lib/crap_server/version.rb

@@ -1,3 +1,3 @@
 module CrapServer
-  VERSION = '0.0.4.0'
+  VERSION = '0.0.4.1'
 end

data/spec/application_spec.rb

@@ -9,6 +9,7 @@ describe CrapServer::Application do
     CrapServer::Application.class_eval do
       @logger = Dummy
     end
+    allow(CrapServer::Forker).to receive(:run).and_return(true)
   end
   context 'run!' do
 
@@ -23,6 +24,7 @@ describe CrapServer::Application do
         allow(Socket).to receive(:new) do |*args|
           Dummy
         end
+        allow_any_instance_of(CrapServer::Forker).to receive(:run).and_return(true)
       end
 
       it 'should bind IPv4 and IPv6' do
@@ -52,7 +54,13 @@ describe CrapServer::Application do
         CrapServer::Application.run! do
         end
       end
-    end
 
+      it 'should execute the forker' do
+        expect_any_instance_of(CrapServer::Forker).to receive(:run).and_return(true)
+        CrapServer::Application.run! do
+        end
+      end
+    end
   end
+
 end

data/spec/forker_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe CrapServer::Forker do
+  context 'run' do
+    before do
+      allow(Process).to receive(:wait).and_return(Dummy)
+      allow(Process).to receive(:kill).and_return(Dummy)
+    end
+
+    it 'should accept a block' do
+      expect(CrapServer::Forker.new(Dummy).method(:run).parameters[-1][1]).to eq(:block)
+    end
+
+    it 'should spawn one process per core' do
+      forker = CrapServer::Forker.new(Dummy)
+      cores = forker.send(:processor_count)
+      expect(forker).to receive(:spawn_child).exactly(cores).times().and_return(Dummy)
+      allow_any_instance_of(CrapServer::Forker).to receive(:check_children).and_return true
+      forker.run do
+      end
+    end
+
+    it 'if someone interrupt the application, we must kill our children' do
+      forker = CrapServer::Forker.new([Dummy, Dummy])
+      cores = forker.send(:processor_count)
+      allow(forker).to receive(:spawn_child).and_return(true)
+      allow_any_instance_of(CrapServer::Forker).to receive(:check_children).and_raise(Interrupt)
+      expect(Process).to receive(:kill).exactly(cores).times().and_return(true)
+      forker.run do
+      end
+    end
+  end
+
+  context 'spawn_child' do
+    pending 'check how to '
+  end
+end

data/spec/thread_pool_spec.rb

@@ -0,0 +1,3 @@
+describe CrapServer::ThreadPool do
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crap_server
 version: !ruby/object:Gem::Version
-  version: 0.0.4.0
+  version: 0.0.4.1
 platform: ruby
 authors:
 - Andres Jose Borek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,7 +61,9 @@ files:
 - lib/crap_server/thread_pool.rb
 - lib/crap_server/version.rb
 - spec/application_spec.rb
+- spec/forker_spec.rb
 - spec/spec_helper.rb
+- spec/thread_pool_spec.rb
 homepage: https://rubygems.org/gems/crap_server
 licenses:
 - MIT
@@ -88,4 +90,6 @@ specification_version: 4
 summary: Really thin a non intuitive ruby server.
 test_files:
 - spec/application_spec.rb
+- spec/forker_spec.rb
 - spec/spec_helper.rb
+- spec/thread_pool_spec.rb