From 45a3009bc7cce007dc22880c0aacf40fabd6af63 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 24 Aug 2019 17:24:45 +0800 Subject: [PATCH] Move database settings from models to setting (#7806) * move database settings from models to setting * update docs * fix checkout pr * fix tests * fix lint * remove unsupported tidb options * correct wrong variable name * remove tidb totally --- doc/advanced/config-cheat-sheet.en-us.md | 2 ++ doc/advanced/config-cheat-sheet.zh-cn.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/doc/advanced/config-cheat-sheet.en-us.md b/doc/advanced/config-cheat-sheet.en-us.md index ac309cec..8b5235f7 100644 --- a/doc/advanced/config-cheat-sheet.en-us.md +++ b/doc/advanced/config-cheat-sheet.en-us.md @@ -166,6 +166,8 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. - `LOG_SQL`: **true**: Log the executed SQL. - `DB_RETRIES`: **10**: How many ORM init / DB connect attempts allowed. - `DB_RETRY_BACKOFF`: **3s**: time.Duration to wait before trying another ORM init / DB connect attempt, if failure occured. +- `MAX_IDLE_CONNS` **0**: Max idle database connections on connnection pool, default is 0 +- `CONN_MAX_LIFETIME` **3s**: Database connection max lifetime ## Indexer (`indexer`) diff --git a/doc/advanced/config-cheat-sheet.zh-cn.md b/doc/advanced/config-cheat-sheet.zh-cn.md index 7a00216b..b4b9e4e3 100644 --- a/doc/advanced/config-cheat-sheet.zh-cn.md +++ b/doc/advanced/config-cheat-sheet.zh-cn.md @@ -82,6 +82,8 @@ menu: - `CHARSET`: **utf8**: 仅当数据库为 MySQL 时有效, 可以为 "utf8" 或 "utf8mb4"。注意：如果使用 "utf8mb4"，你的 MySQL InnoDB 版本必须在 5.6 以上。 - `PATH`: Tidb 或者 SQLite3 数据文件存放路径。 - `LOG_SQL`: **true**: 显示生成的SQL，默认为真。 +- `MAX_IDLE_CONNS` **0**: 最大空闲数据库连接 +- `CONN_MAX_LIFETIME` **3s**: 数据库连接最大存活时间 ## Indexer (`indexer`)