summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-03-04 18:04:39 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2022-03-04 18:04:39 +0900
commit2939b760d346aa5cd4f59675a5ef2ee460b60b75 (patch)
treec8e8d20252fea7e0b8c08bf265d7bdc6ef53d7c5 /packages
parentFix: Only allow admins to access admin views (#8361) (diff)
downloadsharkey-2939b760d346aa5cd4f59675a5ef2ee460b60b75.tar.gz
sharkey-2939b760d346aa5cd4f59675a5ef2ee460b60b75.tar.bz2
sharkey-2939b760d346aa5cd4f59675a5ef2ee460b60b75.zip
set timeout for db query
Resolve #8150
Diffstat (limited to 'packages')
-rw-r--r--packages/backend/src/db/postgre.ts7
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/backend/src/db/postgre.ts b/packages/backend/src/db/postgre.ts
index c1f7245bc7..066a3c6739 100644
--- a/packages/backend/src/db/postgre.ts
+++ b/packages/backend/src/db/postgre.ts
@@ -184,7 +184,7 @@ export function initDb(justBorrow = false, sync = false, forceRecreate = false)
} catch (e) {}
}
- const log = process.env.NODE_ENV != 'production';
+ const log = process.env.NODE_ENV !== 'production';
return createConnection({
type: 'postgres',
@@ -193,7 +193,10 @@ export function initDb(justBorrow = false, sync = false, forceRecreate = false)
username: config.db.user,
password: config.db.pass,
database: config.db.db,
- extra: config.db.extra,
+ extra: {
+ statement_timeout: 1000 * 10,
+ ...config.db.extra,
+ },
synchronize: process.env.NODE_ENV === 'test' || sync,
dropSchema: process.env.NODE_ENV === 'test' && !justBorrow,
cache: !config.db.disableCache ? {