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
e1f3b4b6
Commit
e1f3b4b6
authored
Jul 08, 2019
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Wrap elastic_client_setup initializer in `ee` block
parent
9f9638a7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
37 additions
and
35 deletions
+37
-35
config/initializers/elastic_client_setup.rb
config/initializers/elastic_client_setup.rb
+37
-35
No files found.
config/initializers/elastic_client_setup.rb
View file @
e1f3b4b6
...
...
@@ -2,43 +2,45 @@
require
'gitlab/current_settings'
Elasticsearch
::
Model
::
Response
::
Records
.
prepend
GemExtensions
::
Elasticsearch
::
Model
::
Response
::
Records
Elasticsearch
::
Model
::
Adapter
::
Multiple
::
Records
.
prepend
GemExtensions
::
Elasticsearch
::
Model
::
Adapter
::
Multiple
::
Records
Elasticsearch
::
Model
::
Indexing
::
InstanceMethods
.
prepend
GemExtensions
::
Elasticsearch
::
Model
::
Indexing
::
InstanceMethods
module
Elasticsearch
module
Model
module
Client
# This mutex is only used to synchronize *creation* of a new client, so
# all including classes can share the same client instance
CLIENT_MUTEX
=
Mutex
.
new
cattr_accessor
:cached_client
cattr_accessor
:cached_config
module
ClassMethods
# Override the default ::Elasticsearch::Model::Client implementation to
# return a client configured from application settings. All including
# classes will use the same instance, which is refreshed automatically
# if the settings change.
#
# _client is present to match the arity of the overridden method, where
# it is also not used.
#
# @return [Elasticsearch::Transport::Client]
def
client
(
_client
=
nil
)
store
=
::
Elasticsearch
::
Model
::
Client
store
::
CLIENT_MUTEX
.
synchronize
do
config
=
Gitlab
::
CurrentSettings
.
elasticsearch_config
if
store
.
cached_client
.
nil?
||
config
!=
store
.
cached_config
store
.
cached_client
=
::
Gitlab
::
Elastic
::
Client
.
build
(
config
)
store
.
cached_config
=
config
Gitlab
.
ee
do
Elasticsearch
::
Model
::
Response
::
Records
.
prepend
GemExtensions
::
Elasticsearch
::
Model
::
Response
::
Records
Elasticsearch
::
Model
::
Adapter
::
Multiple
::
Records
.
prepend
GemExtensions
::
Elasticsearch
::
Model
::
Adapter
::
Multiple
::
Records
Elasticsearch
::
Model
::
Indexing
::
InstanceMethods
.
prepend
GemExtensions
::
Elasticsearch
::
Model
::
Indexing
::
InstanceMethods
module
Elasticsearch
module
Model
module
Client
# This mutex is only used to synchronize *creation* of a new client, so
# all including classes can share the same client instance
CLIENT_MUTEX
=
Mutex
.
new
cattr_accessor
:cached_client
cattr_accessor
:cached_config
module
ClassMethods
# Override the default ::Elasticsearch::Model::Client implementation to
# return a client configured from application settings. All including
# classes will use the same instance, which is refreshed automatically
# if the settings change.
#
# _client is present to match the arity of the overridden method, where
# it is also not used.
#
# @return [Elasticsearch::Transport::Client]
def
client
(
_client
=
nil
)
store
=
::
Elasticsearch
::
Model
::
Client
store
::
CLIENT_MUTEX
.
synchronize
do
config
=
Gitlab
::
CurrentSettings
.
elasticsearch_config
if
store
.
cached_client
.
nil?
||
config
!=
store
.
cached_config
store
.
cached_client
=
::
Gitlab
::
Elastic
::
Client
.
build
(
config
)
store
.
cached_config
=
config
end
end
end
store
.
cached_client
store
.
cached_client
end
end
end
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