rbmk 0.1.0.c → 0.1.0.d

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5143c3a5a8749059886ee69b982e04c2d031db1c
-  data.tar.gz: 402fcd93f239baf41671a6f17c3c48cb4477df12
+  metadata.gz: a4110b7240f29397f17634e175d64974cdd2738d
+  data.tar.gz: 5f3c5aa09b7fe10d7f0da8dc75110deb341dff00
 SHA512:
-  metadata.gz: 1694e095a3b21656d0c83825cc9299a489f2681d044ddca7bb8a1503140fde46fa6141649977d225097993558ee62d260e7b28148e9c19115dd190b7c6f9ed32
-  data.tar.gz: a57aedc671d55ae62cf61fbfec2645be724e49ec6d582b4967d9913dc8574324d32cf7e2ed960e0654b44b7049512cdf7c3aed38a83822e0c1a6bc04ec1dbe6a
+  metadata.gz: ebf931c83e0eaf760d92835b8f4b92954081ba70ae85d39a900307a0f81012e0cca692f435eaf9936b3de73489aa08870fe5048526cef76a145afdb895693693
+  data.tar.gz: d51ff4ca6818bb25178ec927b7ea01d471a0074e5ba967378a6c4695767cef7f4bbeafdd83a45b18620edacd20ba0afdb93fa27eaa3ba35624d2aecaf61d98b1

data/lib/rbmk/peer.rb

@@ -1,9 +1,14 @@
 module RBMK
 class Peer
 
+	attr_accessor :socket, :host, :port
 	def initialize client
-		@host = client.peeraddr[3]
-		@port = client.peeraddr[1]
+		@socket = client
+		@host, @port = client.peeraddr.values_at 3, 1
+	end
+
+	def close
+		@socket.close
 	end
 
 	def to_s

data/lib/rbmk/server.rb

@@ -1,9 +1,10 @@
 require 'timeout'
 require 'rbmk/peer'
-require 'rbmk/signal'
 module RBMK
 class Server
 
+	%w( CHLD INT HUP QUIT TERM ).each { |sig| const_set ('SIG%s' % sig).to_sym, Signal.list[sig] }
+
 	class Reaped < StandardError; end
 
 	def initialize
@@ -13,18 +14,23 @@ class Server
 	end
 
 	def start
+		require 'rbmk/version'
+		$log.info sprintf('rbmk version %s (codename %p) is warming up in an orange glow', VERSION, CODENAME)
 		require 'socket'
 		@upstream = self.class.upstream
 		$log.debug sprintf('Listening on %s:%s', self.class.host, self.class.port)
 		@socket = TCPServer.new self.class.host, self.class.port
-		Signal.constants.each { |sig| Signal.trap Signal.const_get(sig), method(:trap) }
 		$0 = sprintf '%s master at %s:%s', @arvg0, self.class.host, self.class.port
+		Signal.trap('CHLD') { raise SignalException, 'CHLD' }
 		loop { accept }
 	ensure
 		@socket.close rescue nil
-		@workers.each { |pid| Process.kill 'TERM', pid rescue nil }
-		Process.waitall rescue nil
-		$log.debug 'Exiting'
+		$log.debug sprintf('Disposing of workers: %p', @workers.keys)
+		Signal.trap('CHLD') {} # we'll bury them in synchronous fashion
+		Thread.abort_on_exception = true
+		@workers.each { |pid,_| Thread.new { kill pid } }
+		sleep(0.1) while Thread.list.count > 1 # make sure everyone is dead
+		$log.info 'Shutdown sequence complete'
 	end
 
 protected
@@ -39,47 +45,66 @@ protected
 	end
 
 	def accept
-		peer = Peer.new(client = @socket.accept)
+		peer = Peer.new @socket.accept
 		$log.info 'Connection from %s' % peer
 		if pid = fork then
-			client.close
-			@workers[pid] = peer
+			peer.close
+			@workers[pid] = true
 		else
 			$log.debug 'Worker started'
-			act_as_a_child_for client, peer
+			@socket.close
+			act_as_a_child_for peer
 		end
-	rescue Reaped
-		$log.debug $!.message
-	end
-
-	def trap sig = nil
-		case sig
-			when nil then raise 'Something went wrong, trapped a nil.'
-			when Signal::CHLD then
-				pid, status = Process.wait2 -1, Process::WNOHANG
-				@workers.delete pid
-				raise Reaped.new('Reaped %s' % pid)
-			else raise 'Terminated on SIG%s' % Signal.signame(sig)
+	rescue SignalException
+		$log.debug 'Trapped %p' % $!.signm
+		case $!.signo
+			when SIGCHLD then reap
+			when SIGINT, SIGHUP, SIGTERM then exit
+			when SIGQUIT then
+				$log.debug 'Committing emergency suicide'
+				exit!
+			else raise $!
 		end
-	rescue Errno::ECHILD
-		# okay, nothing to do
 	end
 
-	def act_as_a_child_for client, peer
-		Signal.trap 'CHLD', 'DEFAULT'
+	def act_as_a_child_for peer
+		Signal.trap 'CHLD', 'SYSTEM_DEFAULT'
 		$master = false
 		remove_instance_variable :@workers
 		$0 = sprintf '%s worker for %s', @arvg0, peer
-		Timeout.timeout(self.class.worker_timeout) { serve client } # FIXME shall move to master in the future
+		Timeout.timeout(self.class.worker_timeout) { serve peer } # FIXME shall move to master in the future or maybe drop altogether in favour of activity detection
+	rescue SignalException
+		$log.debug 'Trapped %p' % $!.signm
+		raise $!
 	rescue Exception
 		$!.log
 	ensure
+		$log.debug 'Terminating'
 		exit!
 	end
 
-	def serve client
+	def serve peer
 		require 'rbmk/worker'
-		Worker.hire client, @upstream
+		Worker.hire peer, @upstream
+	end
+
+	def kill pid
+		$log.debug 'Killing worker %s' % pid
+		Process.kill 'TERM', pid
+		Process.wait pid
+		$log.debug 'Worker %s will not be a problem anymore' % pid
+	rescue Errno::ESRCH
+		$log.debug 'Somehow worker %s was not alive' % pid
+	rescue Errno::ECHILD
+		$log.debug 'Worker %s has suddenly disappeared' % pid
+	end
+
+	def reap
+		pid, status = Process.wait2 -1, Process::WNOHANG
+		@workers.delete pid
+		$log.debug 'Reaped %s' % pid
+	rescue Errno::ECHILD
+		$log.debug 'Something went wrong, no dead workers to reap'
 	end
 
 end

data/lib/rbmk/version.rb

@@ -1,4 +1,4 @@
 module RBMK
-	VERSION = '0.1.0.c'
-	CODENAME = 'as pure as'
+	VERSION = '0.1.0.d'
+	CODENAME = 'not listening'
 end

data/lib/rbmk/worker.rb

@@ -1,14 +1,15 @@
 require 'ldap/server'
 require 'rbmk/operation'
+require 'rbmk/peer'
 module RBMK
 class Worker
 
-	def self.hire client, upstream; new(client, upstream).serve end
+	def self.hire peer, upstream; new(peer, upstream).serve end
 
-	def initialize client, upstream
+	def initialize peer, upstream
 		upstream.mktemp
-		@socket = client
-		@conn = LDAP::Server::Connection.new @socket,
+		@peer = peer
+		@conn = LDAP::Server::Connection.new @peer.socket,
 			server: upstream,
 			logger: $log,
 			operation_class: RBMK::Operation,
@@ -19,7 +20,7 @@ class Worker
 	def serve
 		@conn.handle_requests
 	ensure
-		@socket.close
+		@peer.close
 	end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbmk
 version: !ruby/object:Gem::Version
-  version: 0.1.0.c
+  version: 0.1.0.d
 platform: ruby
 authors:
 - stronny red
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ldap
@@ -60,7 +60,6 @@ files:
 - lib/rbmk/operation.rb
 - lib/rbmk/peer.rb
 - lib/rbmk/server.rb
-- lib/rbmk/signal.rb
 - lib/rbmk/transform.rb
 - lib/rbmk/upstream.rb
 - lib/rbmk/version.rb

data/lib/rbmk/signal.rb

@@ -1,3 +0,0 @@
-module Signal
-	%w( CHLD INT HUP QUIT TERM ).each { |signame| const_set signame.to_sym, list[signame] }
-end