diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-04-20 04:33:22 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-04-20 04:33:22 +0000 |
| commit | c73b6a1c593f7bbab4b09d5cf882de78f54d6f09 (patch) | |
| tree | 18e52a25c25dd18e52c57f9aed979260702caf0e /spec/gitlab_post_receive_spec.rb | |
| parent | 4a8db75d9de6ff5ce56be6c36e957e89971a2d42 (diff) | |
| parent | 750fd3f8447c3e7a742a33f45b46b10e4d763c3e (diff) | |
| download | gitlab-shell-c73b6a1c593f7bbab4b09d5cf882de78f54d6f09.tar.gz | |
Merge branch 'aiionx/gitlab-shell-aiionx-post_receive_jid' into 'master'
Update post receive worker so it logs a unique JID in sidekiq
Taken from !50.
Instead of
```
2016-04-14T03:07:32.373Z 5285 TID-osycgmlyo PostReceive JID- INFO: start
2016-04-14T03:07:32.374Z 5285 TID-osycgmlyo PostReceive JID- INFO: arguments: [...]
2016-04-14T03:07:32.534Z 5285 TID-osycgmlyo PostReceive JID- INFO: done: 0.161 sec
```
Have this log
```
2016-04-14T03:07:32.373Z 5285 TID-osycgmlyo PostReceive JID-54b0b2f6616cae37e3e87f8a INFO: start
2016-04-14T03:07:32.374Z 5285 TID-osycgmlyo PostReceive JID-54b0b2f6616cae37e3e87f8a INFO: arguments: [...]
2016-04-14T03:07:32.534Z 5285 TID-osycgmlyo PostReceive JID-54b0b2f6616cae37e3e87f8a INFO: done: 0.161 sec
```
This way sidekiq can Log a unique JID in the sidekiq.log for PostReceive.
So when parsing the logs (with logstash for example) you know it belongs to that unique job.
This puts the logs in a uniform manner like the other workers that are pushed to redis (which do have a JID)
For example the ProjectWebHookWorker
```
2016-04-14T03:13:07.917Z 5285 TID-osycsh7z0 ProjectWebHookWorker JID-800085fb3cf7241fdeecc6ec INFO: start
2016-04-14T03:13:07.918Z 5285 TID-osycsh7z0 ProjectWebHookWorker JID-800085fb3cf7241fdeecc6ec INFO: arguments: [...]
2016-04-14T03:13:12.500Z 5285 TID-osycsh7z0 ProjectWebHookWorker JID-800085fb3cf7241fdeecc6ec INFO: done: 4.583 sec
```
See merge request !55
Diffstat (limited to 'spec/gitlab_post_receive_spec.rb')
| -rw-r--r-- | spec/gitlab_post_receive_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/gitlab_post_receive_spec.rb b/spec/gitlab_post_receive_spec.rb index 3c1f362..9d7696e 100644 --- a/spec/gitlab_post_receive_spec.rb +++ b/spec/gitlab_post_receive_spec.rb @@ -50,7 +50,7 @@ describe GitlabPostReceive do expect(gitlab_post_receive).to receive(:system).with( *[ *%w(env -i redis-cli rpush resque:gitlab:queue:post_receive), - %Q/{"class":"PostReceive","args":["#{repo_path}","#{actor}",#{base64_changes.inspect}]}/, + %Q/{"class":"PostReceive","args":["#{repo_path}","#{actor}",#{base64_changes.inspect}],"jid":"#{gitlab_post_receive.jid}"}/, { err: "/dev/null", out: "/dev/null" } ] ).and_return(true) |