diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-05-29 15:46:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-29 15:46:35 -0400 |
| commit | 860e5d483cd952ec833c40312a2141bb3e4ef579 (patch) | |
| tree | a854943f1f008f9b0f607f486de4b117b98e08e4 /config | |
| parent | f9843b380074cc6082566a2752c5482210f912bb (diff) | |
| download | chat-860e5d483cd952ec833c40312a2141bb3e4ef579.tar.gz chat-860e5d483cd952ec833c40312a2141bb3e4ef579.tar.bz2 chat-860e5d483cd952ec833c40312a2141bb3e4ef579.zip | |
PLT-6341/PLT-6342 Update gorp to mattermost fork and add connection timeout setting (#6410)
* Update gorp to mattermost fork and add connection timeout setting
* Add go dependency
* Rename from connection timeout to query timeout
* Properly add gorp dependency
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.json b/config/config.json index b9c0516fa..6460f661b 100644 --- a/config/config.json +++ b/config/config.json @@ -85,7 +85,8 @@ "MaxIdleConns": 20, "MaxOpenConns": 300, "Trace": false, - "AtRestEncryptKey": "" + "AtRestEncryptKey": "", + "QueryTimeout": 30 }, "LogSettings": { "EnableConsole": true, |