Adding default timeouts to mysql datasource and missing LicenseFileLocation prop (#6011)

Этот коммит содержится в:
Corey Hulen
2017-04-10 06:25:16 -07:00
коммит произвёл Harrison Healey
родитель dfc6db7374
Коммит 38eced0290

Просмотреть файл

@@ -1,6 +1,7 @@
{ {
"ServiceSettings": { "ServiceSettings": {
"SiteURL": "http://localhost:8065", "SiteURL": "http://localhost:8065",
"LicenseFileLocation": "",
"ListenAddress": ":8065", "ListenAddress": ":8065",
"ConnectionSecurity": "", "ConnectionSecurity": "",
"TLSCertFile": "", "TLSCertFile": "",
@@ -68,7 +69,7 @@
}, },
"SqlSettings": { "SqlSettings": {
"DriverName": "mysql", "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": [], "DataSourceReplicas": [],
"MaxIdleConns": 20, "MaxIdleConns": 20,
"MaxOpenConns": 300, "MaxOpenConns": 300,