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
425e64e9
Commit
425e64e9
authored
Aug 25, 2016
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'info_logging_for_es' into 'master'
[ES] Logging for indexer See merge request !683
parents
82fb4ac0
2e0fb146
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
2 deletions
+22
-2
CHANGELOG-EE
CHANGELOG-EE
+2
-0
bin/elastic_repo_indexer
bin/elastic_repo_indexer
+20
-2
No files found.
CHANGELOG-EE
View file @
425e64e9
Please view this file on the master branch, on stable branches it's out of date.
v 8.11.3
- [ES] Add logging to indexer
v 8.11.2 (Unreleased)
...
...
bin/elastic_repo_indexer
View file @
425e64e9
...
...
@@ -6,6 +6,10 @@ require 'json'
require
'elasticsearch/git'
require
'active_support'
require
'active_support/core_ext'
require
'benchmark'
path_to_log_file
=
File
.
expand_path
(
'../../log/es-indexer.log'
,
__FILE__
)
LOGGER
=
Logger
.
new
(
path_to_log_file
)
PROJECT_ID
=
ARGV
.
shift
REPO_PATH
=
ARGV
.
shift
...
...
@@ -13,6 +17,8 @@ FROM_SHA = ENV['FROM_SHA']
TO_SHA
=
ENV
[
'TO_SHA'
]
RAILS_ENV
=
ENV
[
'RAILS_ENV'
]
LOGGER
.
info
(
"[ES indexer]: Has been scheduled for project
#{
REPO_PATH
}
with SHA range
#{
FROM_SHA
}
:
#{
TO_SHA
}
"
)
elastic_connection_info
=
JSON
.
parse
ENV
[
'ELASTIC_CONNECTION_INFO'
]
ELASTIC_HOST
=
elastic_connection_info
[
'host'
]
ELASTIC_PORT
=
elastic_connection_info
[
'port'
]
...
...
@@ -45,9 +51,21 @@ repo = Repository.new
params
=
{
from_rev:
FROM_SHA
,
to_rev:
TO_SHA
}.
compact
print
"Indexing commits..."
repo
.
index_commits
(
params
)
timings
=
Benchmark
.
measure
do
repo
.
index_commits
(
params
)
end
puts
"Done"
LOGGER
.
info
(
"[ES indexer]: Commits for
#{
REPO_PATH
}
are indexed. Time elapsed:
#{
timings
.
real
}
"
)
print
"Indexing blobs..."
repo
.
index_blobs
(
params
)
timings
=
Benchmark
.
measure
do
repo
.
index_blobs
(
params
)
end
puts
"Done"
LOGGER
.
info
(
"[ES indexer]: Blobs for
#{
REPO_PATH
}
are indexed. Time elapsed:
#{
timings
.
real
}
"
)
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