async-container 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efe790ddbf87b5df04f8b9e441b27fda5fb1cb69cc6fa2b800a64d3f6af46f24
-  data.tar.gz: 6500f4e2b6d21d8f78a6f99065c0af795694f003c15f1f265634be36a4c8f229
+  metadata.gz: e2793bfea616c3829e4e892c854772aba2ace1b28bc425fa792c190882e6290f
+  data.tar.gz: cd78711d9c21080560d2ed175c240a5cd5640b185f73a8aff93f431f46acb89a
 SHA512:
-  metadata.gz: d27b92c0e9333dd121f5f5d65be1249073d1e06e55d018f3d91c0670feb14b8463629783c0fe74c416e8f6df1d08f1c84270a5bc19ec040c68c6778da8bdf02d
-  data.tar.gz: ddb9d010c191f469347a759ff2c90fd8d1cab8fddcb0ab6245357098bb1d576843fd351c767ea1dd9d8302dabe549fef04444e090960e0c9ee3d173ff5cbeed4
+  metadata.gz: 7806e094721c20aa4f160b3505dfe6f21792d96f4e6d697c6f4670990a11ce7a6c03eeed22ef381f229d2014478b935bcf5e4af036a650fa1849f8fa6d6cb560
+  data.tar.gz: 744567b07a9aedfc02ad12e06f4620013e8345a260970e78c88fd39a4e4a90c7d4fcc691724c94009f3b9eb2ead81948139223d8a28b3c9f4b4ca3afdcbd69bd

data/lib/async/container/controller.rb

@@ -28,9 +28,10 @@ require_relative 'notify'
 
 module Async
 	module Container
-		class ContainerError < Error
+		class InitializationError < Error
 			def initialize(container)
 				super("Could not create container!")
+				
 				@container = container
 			end
 			
@@ -117,7 +118,7 @@ module Async
 				rescue
 					@notify&.error!($!.to_s)
 					
-					raise ContainerError, container
+					raise InitializationError, container
 				end
 				
 				# Wait for all child processes to enter the ready state.
@@ -130,7 +131,7 @@ module Async
 					
 					container.stop
 					
-					raise ContainerError, container
+					raise InitializationError, container
 				end
 				
 				# Make this swap as atomic as possible:
@@ -142,6 +143,8 @@ module Async
 			rescue
 				# If we are leaving this function with an exception, try to kill the container:
 				container&.stop(false)
+				
+				raise
 			end
 			
 			def reload
@@ -152,7 +155,7 @@ module Async
 				begin
 					self.setup(@container)
 				rescue
-					raise ContainerError, container
+					raise InitializationError, container
 				end
 				
 				# Wait for all child processes to enter the ready state.
@@ -163,7 +166,7 @@ module Async
 				if @container.failed?
 					@notify.error!("Container failed!")
 					
-					raise ContainerError, @container
+					raise InitializationError, @container
 				else
 					@notify&.ready!
 				end
@@ -188,8 +191,8 @@ module Async
 						if handler = @signals[exception.signo]
 							begin
 								handler.call
-							rescue ContainerError => failure
-								Async.logger.error(self) {failure}
+							rescue InitializationError => error
+								Async.logger.error(self) {error}
 							end
 						else
 							raise
@@ -200,9 +203,9 @@ module Async
 				self.stop(true)
 			rescue Terminate
 				self.stop(false)
-			else
-				self.stop(true)
 			ensure
+				self.stop(true)
+				
 				# Restore the interrupt handler:
 				Signal.trap(:INT, interrupt_action)
 				Signal.trap(:TERM, terminate_action)

data/lib/async/container/generic.rb

@@ -144,7 +144,7 @@ module Async
 						end
 						
 						if status.success?
-							Async.logger.info(self) {"#{child} #{status}"}
+							Async.logger.info(self) {"#{child} exited with #{status}"}
 						else
 							@statistics.failure!
 							Async.logger.error(self) {status}

data/lib/async/container/notify.rb

@@ -23,6 +23,7 @@
 
 require_relative 'notify/pipe'
 require_relative 'notify/socket'
+require_relative 'notify/console'
 
 module Async
 	module Container
@@ -34,7 +35,8 @@ module Async
 				# Select the best available client:
 				@@client ||= (
 					Pipe.open! ||
-					Socket.open!
+					Socket.open! ||
+					Console.open!
 				)
 			end
 		end

data/lib/async/container/notify/console.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+#
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'client'
+
+require 'console/logger'
+
+module Async
+	module Container
+		module Notify
+			class Console < Client
+				def self.open!(logger = ::Console.logger)
+					self.new(logger)
+				end
+				
+				def initialize(logger)
+					@logger = logger
+				end
+				
+				def send(level: :debug, **message)
+					@logger.send(level, self) {message[:status]}
+				end
+				
+				def ready!(**message)
+					send(ready: true, **message)
+				end
+				
+				def restarting!(**message)
+					message[:ready] = false
+					message[:reloading] = true
+					message[:status] ||= "Restarting..."
+					
+					send(**message)
+				end
+				
+				def reloading!(**message)
+					message[:ready] = false
+					message[:reloading] = true
+					message[:status] ||= "Reloading..."
+					
+					send(**message)
+				end
+				
+				def error!(text, **message)
+					send(status: text, level: :error, **message)
+				end
+			end
+		end
+	end
+end

data/lib/async/container/process.rb

@@ -119,13 +119,7 @@ module Async
 			attr :name
 			
 			def to_s
-				if @status
-					"\#<#{self.class} #{@name} -> #{@status}>"
-				elsif @pid
-					"\#<#{self.class} #{@name} -> #{@pid}>"
-				else
-					"\#<#{self.class} #{@name}>"
-				end
+				"\#<#{self.class} #{@name}>"
 			end
 			
 			def close

data/lib/async/container/thread.rb

@@ -124,11 +124,7 @@ module Async
 			end
 			
 			def to_s
-				if @status
-					"\#<#{self.class} #{@thread.name} -> #{@status}>"
-				else
-					"\#<#{self.class} #{@thread.name}>"
-				end
+				"\#<#{self.class} #{@thread.name}>"
 			end
 			
 			def close

data/lib/async/container/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module Container
-		VERSION = "0.16.1"
+		VERSION = "0.16.2"
 	end
 end

data/spec/async/container/controller_spec.rb

@@ -91,5 +91,16 @@ RSpec.describe Async::Container::Controller do
 			
 			subject.stop
 		end
+		
+		it "propagates exceptions" do
+			def subject.setup(container)
+				raise "Boom!"
+			end
+			
+			expect do
+				subject.run
+			end.to raise_exception(Async::Container::InitializationError)
+		end
+		
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-container
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-01 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: process-group
@@ -163,6 +163,7 @@ files:
 - lib/async/container/keyed.rb
 - lib/async/container/notify.rb
 - lib/async/container/notify/client.rb
+- lib/async/container/notify/console.rb
 - lib/async/container/notify/pipe.rb
 - lib/async/container/notify/server.rb
 - lib/async/container/notify/socket.rb