summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-10-17 06:50:41 -0700
committerenahum <nahumhbl@gmail.com>2016-10-17 10:50:41 -0300
commit219f4e36e5c78982317a85e8a49cda74562d6b65 (patch)
tree708e9c8e3e3b0ed661abedf54ddc8f6606266aba
parente7b25f4cd8b7d87b99153fd4a901d3f9f92d7b0d (diff)
downloadchat-219f4e36e5c78982317a85e8a49cda74562d6b65.tar.gz
chat-219f4e36e5c78982317a85e8a49cda74562d6b65.tar.bz2
chat-219f4e36e5c78982317a85e8a49cda74562d6b65.zip
Bumping up the defaults (#4229)
-rw-r--r--config/config.json4
-rw-r--r--model/config.go4
2 files changed, 4 insertions, 4 deletions
diff --git a/config/config.json b/config/config.json
index e96a9b237..8b5a8576f 100644
--- 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
index 12f833b89..8d49434f6 100644
--- 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 {