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
Boxiang Sun
gitlab-ce
Commits
2625a4cc
Commit
2625a4cc
authored
Nov 27, 2015
by
Gabriel Mazetto
Committed by
Gabriel Mazetto
Aug 04, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sidekiq get config settings from Gitlab::RedisConfig
parent
ef604388
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
8 deletions
+6
-8
config/initializers/sidekiq.rb
config/initializers/sidekiq.rb
+6
-8
No files found.
config/initializers/sidekiq.rb
View file @
2625a4cc
# Custom Redis configuration
redis_config_hash
=
Gitlab
::
Redis
.
params
redis_config_hash
[
:namespace
]
=
Gitlab
::
Redis
::
SIDEKIQ_NAMESPACE
Sidekiq
.
configure_server
do
|
config
|
config
.
redis
=
{
url:
Gitlab
::
Redis
.
url
,
namespace:
Gitlab
::
Redis
::
SIDEKIQ_NAMESPACE
}
config
.
redis
=
redis_config_hash
config
.
server_middleware
do
|
chain
|
chain
.
add
Gitlab
::
SidekiqMiddleware
::
ArgumentsLogger
if
ENV
[
'SIDEKIQ_LOG_ARGUMENTS'
]
...
...
@@ -39,8 +40,5 @@ Sidekiq.configure_server do |config|
end
Sidekiq
.
configure_client
do
|
config
|
config
.
redis
=
{
url:
Gitlab
::
Redis
.
url
,
namespace:
Gitlab
::
Redis
::
SIDEKIQ_NAMESPACE
}
config
.
redis
=
redis_config_hash
end
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