summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Arko <andre@arko.net>2013-09-24 09:55:49 -0700
committerAndré Arko <andre@arko.net>2013-09-24 09:55:49 -0700
commit5b09da434bb5cf6209e13ad43cfb035bdc7c7f0b (patch)
tree4f954a98cdb1c28e25496d6b93cbc3f9c170fdc2
parent955bcd18192e106283a3bcbc36c32d0037df85de (diff)
parentb6f0a56bc932845b71b2c8dba0fd9a40b21a8d7e (diff)
downloadbundler-5b09da434bb5cf6209e13ad43cfb035bdc7c7f0b.tar.gz
Merge pull request #2645 from bundler/fix-worker-cleanup-error
Stop threads before killing the worker
-rw-r--r--lib/bundler/parallel_workers/worker.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/parallel_workers/worker.rb b/lib/bundler/parallel_workers/worker.rb
index 975b6a3342..6e22eb4ce7 100644
--- a/lib/bundler/parallel_workers/worker.rb
+++ b/lib/bundler/parallel_workers/worker.rb
@@ -39,8 +39,8 @@ module Bundler
# Stop the forked workers and started threads
def stop
- stop_workers
stop_threads
+ stop_workers
end
private