diff options
| author | Corey Hulen <corey@hulen.com> | 2017-04-10 06:25:16 -0700 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-04-10 09:25:16 -0400 |
| commit | 38eced02908ea95cc2a52167d48c086d09db3532 (patch) | |
| tree | 5a2481c84e41859eb648f88606527288050da06a /config | |
| parent | dfc6db737411bd4ad68a803be5182f06055a1769 (diff) | |
| download | chat-38eced02908ea95cc2a52167d48c086d09db3532.tar.gz chat-38eced02908ea95cc2a52167d48c086d09db3532.tar.bz2 chat-38eced02908ea95cc2a52167d48c086d09db3532.zip | |
Adding default timeouts to mysql datasource and missing LicenseFileLocation prop (#6011)
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 b3dac758a..d1d3f9ae2 100644 --- a/config/config.json +++ b/config/config.json @@ -1,6 +1,7 @@ { "ServiceSettings": { "SiteURL": "http://localhost:8065", + "LicenseFileLocation": "", "ListenAddress": ":8065", "ConnectionSecurity": "", "TLSCertFile": "", @@ -68,7 +69,7 @@ }, "SqlSettings": { "DriverName": "mysql", - "DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8", + "DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s", "DataSourceReplicas": [], "MaxIdleConns": 20, "MaxOpenConns": 300, |