Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
37748e44
Commit
37748e44
authored
Jul 30, 2018
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move rbtrace initialization into Sidekiq
parent
82092366
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
config/initializers/rbtrace.rb
config/initializers/rbtrace.rb
+0
-5
config/initializers/sidekiq.rb
config/initializers/sidekiq.rb
+2
-0
No files found.
config/initializers/rbtrace.rb
deleted
100644 → 0
View file @
82092366
# frozen_string_literal: true
# rbtrace needs to be included after the unicorn worker forks.
# See the after_fork block in config/unicorn.rb.example.
require
'rbtrace'
if
ENV
[
'ENABLE_RBTRACE'
]
&&
Sidekiq
.
server?
config/initializers/sidekiq.rb
View file @
37748e44
...
@@ -8,6 +8,8 @@ Sidekiq.default_worker_options = { retry: 3 }
...
@@ -8,6 +8,8 @@ Sidekiq.default_worker_options = { retry: 3 }
enable_json_logs
=
Gitlab
.
config
.
sidekiq
.
log_format
==
'json'
enable_json_logs
=
Gitlab
.
config
.
sidekiq
.
log_format
==
'json'
Sidekiq
.
configure_server
do
|
config
|
Sidekiq
.
configure_server
do
|
config
|
require
'rbtrace'
if
ENV
[
'ENABLE_RBTRACE'
]
config
.
redis
=
queues_config_hash
config
.
redis
=
queues_config_hash
config
.
server_middleware
do
|
chain
|
config
.
server_middleware
do
|
chain
|
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment