diff options
| author | Nat Morris <nat@nuqe.net> | 2017-02-13 12:49:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 12:49:51 +0000 |
| commit | c83c7e87d8e56739aad37a1fa994a63896d2f684 (patch) | |
| tree | fbc9ab48eea893dc1ffec5eedeb5905933d67e8f /lib/oxidized/worker.rb | |
| parent | e6e72296d7e22eaa6fe20fd0b2007d3b58a078a2 (diff) | |
| parent | 3d3a308faae69572ac17fd6c44ac726d0a958cf9 (diff) | |
Merge pull request #3 from ytti/master
Bring Netflix fork in sync with upstream
Diffstat (limited to 'lib/oxidized/worker.rb')
| -rw-r--r-- | lib/oxidized/worker.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/oxidized/worker.rb b/lib/oxidized/worker.rb index 1952d01..80d65cb 100644 --- a/lib/oxidized/worker.rb +++ b/lib/oxidized/worker.rb @@ -3,8 +3,9 @@ module Oxidized require 'oxidized/jobs' class Worker def initialize nodes - @nodes = nodes - @jobs = Jobs.new(Oxidized.config.threads, Oxidized.config.interval, @nodes) + @nodes = nodes + @jobs = Jobs.new(Oxidized.config.threads, Oxidized.config.interval, @nodes) + @nodes.jobs = @jobs Thread.abort_on_exception = true end |