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
23518c6e
Commit
23518c6e
authored
Mar 03, 2017
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop offenses
parent
81529cc0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
lib/gitlab/geo/health_check.rb
lib/gitlab/geo/health_check.rb
+5
-4
No files found.
lib/gitlab/geo/health_check.rb
View file @
23518c6e
...
@@ -4,8 +4,8 @@ module Gitlab
...
@@ -4,8 +4,8 @@ module Gitlab
def
self
.
perform_checks
def
self
.
perform_checks
return
''
unless
Gitlab
::
Geo
.
secondary?
return
''
unless
Gitlab
::
Geo
.
secondary?
database_version
=
self
.
get_database_version
.
to_i
database_version
=
self
.
get_database_version
migration_version
=
self
.
get_migration_version
.
to_i
migration_version
=
self
.
get_migration_version
if
database_version
!=
migration_version
if
database_version
!=
migration_version
"Current Geo database version (
#{
database_version
}
) does not match latest migration (
#{
migration_version
}
)."
"Current Geo database version (
#{
database_version
}
) does not match latest migration (
#{
migration_version
}
)."
...
@@ -18,7 +18,7 @@ module Gitlab
...
@@ -18,7 +18,7 @@ module Gitlab
def
self
.
db_migrate_path
def
self
.
db_migrate_path
# Lazy initialisation so Rails.root will be defined
# Lazy initialisation so Rails.root will be defined
@
@
db_migrate_path
||=
File
.
join
(
Rails
.
root
,
'db_geo'
,
'migrate'
)
@db_migrate_path
||=
File
.
join
(
Rails
.
root
,
'db_geo'
,
'migrate'
)
end
end
def
self
.
get_database_version
def
self
.
get_database_version
...
@@ -30,6 +30,7 @@ module Gitlab
...
@@ -30,6 +30,7 @@ module Gitlab
connection
.
execute
(
"SELECT MAX(version) AS version FROM
#{
schema_migrations_table_name
}
"
)
connection
.
execute
(
"SELECT MAX(version) AS version FROM
#{
schema_migrations_table_name
}
"
)
.
first
.
first
.
fetch
(
'version'
)
.
fetch
(
'version'
)
.
to_i
else
else
0
0
end
end
...
@@ -47,7 +48,7 @@ module Gitlab
...
@@ -47,7 +48,7 @@ module Gitlab
end
end
end
end
latest_migration
latest_migration
.
to_i
end
end
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