Bumping up the defaults (mattermost#4229)

keithgallant · Oct 17, 2016 · 219f4e3 · 219f4e3
1 parent e7b25f4
commit 219f4e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/config/config.json b/config/config.json
@@ -8,8 +8,8 @@
         "UseLetsEncrypt": false,
         "LetsEncryptCertificateCacheFile": "./config/letsencrypt.cache",
         "Forward80To443": false,
-        "ReadTimeout": 30,
-        "WriteTimeout": 60,
+        "ReadTimeout": 300,
+        "WriteTimeout": 300,
         "MaximumLoginAttempts": 10,
         "SegmentDeveloperKey": "",
         "GoogleDeveloperKey": "",

diff --git a/model/config.go b/model/config.go
@@ -940,12 +940,12 @@ func (o *Config) SetDefaults() {
 
 	if o.ServiceSettings.ReadTimeout == nil {
 		o.ServiceSettings.ReadTimeout = new(int)
-		*o.ServiceSettings.ReadTimeout = 30
+		*o.ServiceSettings.ReadTimeout = 300
 	}
 
 	if o.ServiceSettings.WriteTimeout == nil {
 		o.ServiceSettings.WriteTimeout = new(int)
-		*o.ServiceSettings.WriteTimeout = 60
+		*o.ServiceSettings.WriteTimeout = 300
 	}
 
 	if o.ServiceSettings.Forward80To443 == nil {