This repository has been archived by the owner on Dec 17, 2024. It is now read-only.
Daemon: introduce a 5s connect timeout on opening Postgres connections #419
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently the startup can freeze for long periods on incorrect host info or in case of real network problems / throttling
pashagolub
reviewed
Oct 29, 2021
Comment on lines
+348
to
369
| if !strings.Contains(strings.ToLower(connStr), "sslmode") { | ||
| if strings.Contains(connStr, "postgresql://") { // JDBC style | ||
| if strings.Contains(connStr, "?") { // has some extra params already | ||
| connStr += "&sslmode=disable" // defaulting to "disable" as Go driver doesn't support "prefer" | ||
| } else { | ||
| connStr += "?sslmode=disable" | ||
| } | ||
| } else { // LibPQ style | ||
| connStr += " sslmode=disable" | ||
| } | ||
| } | ||
| if !strings.Contains(strings.ToLower(connStr), "connect_timeout") { | ||
| if strings.Contains(connStr, "postgresql://") { // JDBC style | ||
| if strings.Contains(connStr, "?") { // has some extra params already | ||
| connStr += "&connect_timeout=5" // 5 seconds | ||
| } else { | ||
| //log.Debug("Adding sslmode", libPqConnString+"?sslmode=disable") | ||
| db, err = sqlx.Open("postgres", libPqConnString+"?sslmode=disable") | ||
| connStr += "?connect_timeout=5" | ||
| } | ||
| } else { // LibPQ style | ||
| db, err = sqlx.Open("postgres", libPqConnString+" sslmode=disable") | ||
| connStr += " connect_timeout=5" | ||
| } | ||
| } |
There was a problem hiding this comment.
Copy-Paste detected! :-)
It should be function call, e.g.
connStr = AddDefaultParam(connStr, "sslmode", "disable");
connStr = AddDefaultParam(connStr, "connect_timeout", "5");
There was a problem hiding this comment.
Guilty as charged sadly :) Tons of refactoring probably required in many places...will one ever find time for that, that is the big question :)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently the startup can freeze for long periods on incorrect host info
or in case of real network problems / throttling