bundler/lib/bundler/worker.rb in rubygems-update-2.6.8 vs bundler/lib/bundler/worker.rb in rubygems-update-2.6.9
- old
+ new
@@ -23,22 +23,20 @@
def initialize(size, name, func)
@name = name
@request_queue = Queue.new
@response_queue = Queue.new
@func = func
- @threads = Array.new(size) do |i|
- Thread.start { process_queue(i) }.tap do |thread|
- thread.name = "#{name} Worker ##{i}" if thread.respond_to?(:name=)
- end
- end
+ @size = size
+ @threads = nil
trap("INT") { abort_threads }
end
# Enqueue a request to be executed in the worker pool
#
# @param obj [String] mostly it is name of spec that should be downloaded
def enq(obj)
+ create_threads unless @threads
@request_queue.enq obj
end
# Retrieves results of job function being executed in worker pool
def deq
@@ -68,15 +66,39 @@
end
# Stop the worker threads by sending a poison object down the request queue
# so as worker threads after retrieving it, shut themselves down
def stop_threads
+ return unless @threads
@threads.each { @request_queue.enq POISON }
@threads.each(&:join)
+ @threads = nil
end
def abort_threads
+ return unless @threads
@threads.each(&:exit)
exit 1
+ end
+
+ def create_threads
+ creation_errors = []
+
+ @threads = Array.new(@size) do |i|
+ begin
+ Thread.start { process_queue(i) }.tap do |thread|
+ thread.name = "#{name} Worker ##{i}" if thread.respond_to?(:name=)
+ end
+ rescue ThreadError => e
+ creation_errors << e
+ nil
+ end
+ end.compact
+
+ return if creation_errors.empty?
+
+ message = "Failed to create threads for the #{name} worker: #{creation_errors.map(&:to_s).uniq.join(", ")}"
+ raise ThreadCreationError, message if @threads.empty?
+ Bundler.ui.info message
end
end
end