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
5ebf93c5
Commit
5ebf93c5
authored
Apr 25, 2018
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Geo] Minor fix for rake geo:status task
We need to catch exception when even_log is not found
parent
58409a2b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
ee/changelogs/unreleased/fix-geo-status-rake-command.yml
ee/changelogs/unreleased/fix-geo-status-rake-command.yml
+5
-0
ee/lib/tasks/geo.rake
ee/lib/tasks/geo.rake
+5
-3
No files found.
ee/changelogs/unreleased/fix-geo-status-rake-command.yml
0 → 100644
View file @
5ebf93c5
---
title
:
"
[Geo]
Fix
rake
geo:status
when
event_log
is
not
found"
merge_request
:
author
:
type
:
fixed
ee/lib/tasks/geo.rake
View file @
5ebf93c5
...
...
@@ -256,8 +256,7 @@ namespace :geo do
print
'Last event ID seen from primary: '
.
rjust
(
COLUMN_WIDTH
)
last_event
=
Geo
::
EventLog
.
last
last_event_id
=
last_event
&
.
id
print
last_event_id
print
last_event
&
.
id
puts
"(
#{
time_ago_in_words
(
last_event
&
.
created_at
)
}
ago)"
print
'Last event ID processed by cursor: '
.
rjust
(
COLUMN_WIDTH
)
...
...
@@ -265,7 +264,10 @@ namespace :geo do
if
cursor_last_event_id
print
cursor_last_event_id
puts
"(
#{
time_ago_in_words
(
Geo
::
EventLog
.
find_by
(
id:
cursor_last_event_id
)
&
.
created_at
)
}
ago)"
last_cursor_event_date
=
Geo
::
EventLog
.
find_by
(
id:
cursor_last_event_id
)
&
.
created_at
puts
"(
#{
time_ago_in_words
(
last_cursor_event_date
)
}
ago)"
if
last_cursor_event_date
end
print
'Last status was pulled by primary node: '
.
rjust
(
COLUMN_WIDTH
)
...
...
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