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
2625a4cc
Commit
2625a4cc
authored
9 years ago
by
Gabriel Mazetto
Committed by
Gabriel Mazetto
8 years ago
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
|
Sidekiq
.
configure_server
do
|
config
|
config
.
redis
=
{
config
.
redis
=
redis_config_hash
url:
Gitlab
::
Redis
.
url
,
namespace:
Gitlab
::
Redis
::
SIDEKIQ_NAMESPACE
}
config
.
server_middleware
do
|
chain
|
config
.
server_middleware
do
|
chain
|
chain
.
add
Gitlab
::
SidekiqMiddleware
::
ArgumentsLogger
if
ENV
[
'SIDEKIQ_LOG_ARGUMENTS'
]
chain
.
add
Gitlab
::
SidekiqMiddleware
::
ArgumentsLogger
if
ENV
[
'SIDEKIQ_LOG_ARGUMENTS'
]
...
@@ -39,8 +40,5 @@ Sidekiq.configure_server do |config|
...
@@ -39,8 +40,5 @@ Sidekiq.configure_server do |config|
end
end
Sidekiq
.
configure_client
do
|
config
|
Sidekiq
.
configure_client
do
|
config
|
config
.
redis
=
{
config
.
redis
=
redis_config_hash
url:
Gitlab
::
Redis
.
url
,
namespace:
Gitlab
::
Redis
::
SIDEKIQ_NAMESPACE
}
end
end
This diff is collapsed.
Click to expand it.
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