summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2018-06-30 12:24:04 -0400
committerJoramWilander <jwawilander@gmail.com>2018-06-30 12:24:04 -0400
commit3848cb7e79e019e2f0878d6e2377ad36b3c7ca43 (patch)
tree98beeb962ffc6d7c3f8cd38651eaccab4a9685fa /config
parent88c5e469ca869d9e8ceadb0f2b03e86005102f24 (diff)
parent2362a5b7f7c2b4bf2b35b104e8616d847b33b0be (diff)
downloadchat-3848cb7e79e019e2f0878d6e2377ad36b3c7ca43.tar.gz
chat-3848cb7e79e019e2f0878d6e2377ad36b3c7ca43.tar.bz2
chat-3848cb7e79e019e2f0878d6e2377ad36b3c7ca43.zip
Merge branch 'master' into plugins-2
Diffstat (limited to 'config')
-rw-r--r--config/default.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/default.json b/config/default.json
index 2d1e6ceec..6e4f6d1eb 100644
--- a/config/default.json
+++ b/config/default.json
@@ -119,6 +119,7 @@
"DataSourceReplicas": [],
"DataSourceSearchReplicas": [],
"MaxIdleConns": 20,
+ "ConnMaxLifetimeMilliseconds": 3600000,
"MaxOpenConns": 300,
"Trace": false,
"AtRestEncryptKey": "",