Skip to content

Commit e8cecdc

Browse files
balasankarcstanhu
andcommitted
Merge branch 'sh-fix-missing-log-arguments' into 'master'
Fix missing arguments when PostgreSQL upgrade times out See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7558 Merged-by: Balasankar 'Balu' C <[email protected]> Approved-by: Balasankar 'Balu' C <[email protected]> Co-authored-by: Stan Hu <[email protected]>
2 parents 4334402 + 39fa902 commit e8cecdc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

files/gitlab-ctl-commands/lib/gitlab_ctl/pg_upgrade.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def run_pg_upgrade
157157
log "STDERR: #{e.stderr}"
158158
false
159159
rescue Mixlib::ShellOut::CommandTimeout
160-
log
160+
log ""
161161
log "Timed out during the database upgrade.".color(:red)
162162
log "To run with more time, remove the temporary directory #{tmp_data_dir}.#{target_version.major},".color(:red)
163163
log "then re-run your previous command, adding the --timeout option.".color(:red)

0 commit comments

Comments
 (0)