From 38eced02908ea95cc2a52167d48c086d09db3532 Mon Sep 17 00:00:00 2001
From: Corey Hulen <corey@hulen.com>
Date: Mon, 10 Apr 2017 06:25:16 -0700
Subject: [PATCH] Adding default timeouts to mysql datasource and missing
 LicenseFileLocation prop (#6011)

---
 config/config.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/config.json b/config/config.json
index b3dac758ae..d1d3f9ae28 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,