diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-09-05 01:34:28 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-11-02 18:10:57 +0100 |
| commit | 3cc28601f37c11e444362495f27d39aee3d7aaca (patch) | |
| tree | bb69bfc20e78d8725c8903ac0ead3f642ea7f09c /lib/gitlab/daemon.rb | |
| parent | b6d75b29551e250f853b1a85919c677ecd85ac73 (diff) | |
| download | gitlab-ce-3cc28601f37c11e444362495f27d39aee3d7aaca.tar.gz | |
Cleanup sampling code and fix bug with samplers running without sleep
Diffstat (limited to 'lib/gitlab/daemon.rb')
| -rw-r--r-- | lib/gitlab/daemon.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/daemon.rb b/lib/gitlab/daemon.rb index dfd17e35707..f07fd1dfdda 100644 --- a/lib/gitlab/daemon.rb +++ b/lib/gitlab/daemon.rb @@ -43,7 +43,7 @@ module Gitlab if thread thread.wakeup if thread.alive? - thread.join + thread.join unless Thread.current == thread @thread = nil end end |