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
842d277d
Commit
842d277d
authored
Oct 05, 2020
by
Dmytro Zaporozhets (DZ)
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ab/seeder-timeout' into 'master'
Seeder timeouts See merge request gitlab-org/gitlab!44166
parents
840d4825
687c56c6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
1 deletion
+10
-1
lib/gitlab/seeder.rb
lib/gitlab/seeder.rb
+10
-1
No files found.
lib/gitlab/seeder.rb
View file @
842d277d
...
...
@@ -87,7 +87,9 @@ module Gitlab
SeedFu
.
quiet
=
true
without_statement_timeout
do
yield
end
SeedFu
.
quiet
=
false
ActiveRecord
::
Base
.
logger
=
old_logger
...
...
@@ -114,6 +116,13 @@ module Gitlab
def
self
.
mute_mailer
ActionMailer
::
MessageDelivery
.
prepend
(
DeliverNever
)
end
def
self
.
without_statement_timeout
ActiveRecord
::
Base
.
connection
.
execute
(
'SET statement_timeout=0'
)
yield
ensure
ActiveRecord
::
Base
.
connection
.
execute
(
'RESET statement_timeout'
)
end
end
end
# :nocov:
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