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
52bf5b0e
Commit
52bf5b0e
authored
Mar 06, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3159 from peikk0/allow-redis-via-socket
Allow connection to Redis via unix socket
parents
1c2a7bc3
67a61c80
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
config/initializers/4_sidekiq.rb
config/initializers/4_sidekiq.rb
+3
-3
config/resque.yml.example
config/resque.yml.example
+3
-3
doc/install/installation.md
doc/install/installation.md
+1
-1
No files found.
config/initializers/4_sidekiq.rb
View file @
52bf5b0e
...
@@ -4,19 +4,19 @@ config_file = Rails.root.join('config', 'resque.yml')
...
@@ -4,19 +4,19 @@ config_file = Rails.root.join('config', 'resque.yml')
resque_url
=
if
File
.
exists?
(
config_file
)
resque_url
=
if
File
.
exists?
(
config_file
)
YAML
.
load_file
(
config_file
)[
Rails
.
env
]
YAML
.
load_file
(
config_file
)[
Rails
.
env
]
else
else
"localhost:6379"
"
redis://
localhost:6379"
end
end
Sidekiq
.
configure_server
do
|
config
|
Sidekiq
.
configure_server
do
|
config
|
config
.
redis
=
{
config
.
redis
=
{
url:
"redis://
#{
resque_url
}
"
,
url:
resque_url
,
namespace:
'resque:gitlab'
namespace:
'resque:gitlab'
}
}
end
end
Sidekiq
.
configure_client
do
|
config
|
Sidekiq
.
configure_client
do
|
config
|
config
.
redis
=
{
config
.
redis
=
{
url:
"redis://
#{
resque_url
}
"
,
url:
resque_url
,
namespace:
'resque:gitlab'
namespace:
'resque:gitlab'
}
}
end
end
config/resque.yml.example
View file @
52bf5b0e
development: localhost:6379
development:
redis://
localhost:6379
test: localhost:6379
test:
redis://
localhost:6379
production: redis.example.com:6379
production: redis
://redis
.example.com:6379
doc/install/installation.md
View file @
52bf5b0e
...
@@ -288,7 +288,7 @@ a different host, you can configure its connection string via the
...
@@ -288,7 +288,7 @@ a different host, you can configure its connection string via the
`config/resque.yml`
file.
`config/resque.yml`
file.
# example
# example
production: redis.example.tld:6379
production: redis
://redis
.example.tld:6379
## Custom SSH Connection
## Custom SSH Connection
...
...
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