(feat) support max connection setting for database configuration #7520
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
bergquist
requested changes
Feb 10, 2017
pkg/services/sqlstore/sqlstore.go
Outdated
| @@ -177,6 +198,18 @@ func LoadConfig() { | |||
| DbCfg.Host = sec.Key("host").String() | |||
| DbCfg.Name = sec.Key("name").String() | |||
| DbCfg.User = sec.Key("user").String() | |||
| DbCfg.MaxConn, err = sec.Key("max_conn").Int() | |||
There was a problem hiding this comment.
Please use .MustInt(0) instead. Reduce the amount of code needed to read the setting. 0 is the default value anyway :)
pkg/services/sqlstore/sqlstore.go
Outdated
| if err != nil { | ||
| return nil, err | ||
| } else { | ||
| if DbCfg.MaxConn != 0 { |
There was a problem hiding this comment.
This if statement is kinda of redundant. xorm will ignore any connection setting that is 0. So just pass in the DbCfg.MaxConn value. Same for MaxOpenConn and MaxIdleConn
There was a problem hiding this comment.
oh, didn't know that, thanks for the information!
|
fixed |
bergquist
approved these changes
Feb 10, 2017
|
Merged! Thank you for contributing! :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix #7427