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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
3d414d76
Commit
3d414d76
authored
Jul 08, 2019
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Wrap EE-only Sidekiq configuration in `ee` block
parent
fb85fd9d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
9 deletions
+10
-9
config/initializers/sidekiq.rb
config/initializers/sidekiq.rb
+10
-9
No files found.
config/initializers/sidekiq.rb
View file @
3d414d76
...
...
@@ -77,10 +77,6 @@ Sidekiq.configure_server do |config|
end
Sidekiq
::
Cron
::
Job
.
load_from_hash!
cron_jobs
Gitlab
::
Mirror
.
configure_cron_job!
Gitlab
::
Geo
.
configure_cron_jobs!
Gitlab
::
SidekiqVersioning
.
install!
db_config
=
Gitlab
::
Database
.
config
||
...
...
@@ -89,13 +85,18 @@ Sidekiq.configure_server do |config|
ActiveRecord
::
Base
.
establish_connection
(
db_config
)
Rails
.
logger
.
debug
(
"Connection Pool size for Sidekiq Server is now:
#{
ActiveRecord
::
Base
.
connection
.
pool
.
instance_variable_get
(
'@size'
)
}
"
)
# EE only
Gitlab
.
ee
do
Gitlab
::
Mirror
.
configure_cron_job!
Gitlab
::
Geo
.
configure_cron_jobs!
if
Gitlab
::
Geo
.
geo_database_configured?
Rails
.
configuration
.
geo_database
[
'pool'
]
=
Sidekiq
.
options
[
:concurrency
]
Geo
::
TrackingBase
.
establish_connection
(
Rails
.
configuration
.
geo_database
)
Rails
.
logger
.
debug
(
"Connection Pool size for Sidekiq Server is now:
#{
Geo
::
TrackingBase
.
connection_pool
.
size
}
(Geo tracking database)"
)
end
end
# Avoid autoload issue such as 'Mail::Parsers::AddressStruct'
# https://github.com/mikel/mail/issues/912#issuecomment-214850355
...
...
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