diff --git a/back/data/index.ts b/back/data/index.ts index 6c74b0c3..97c56023 100644 --- a/back/data/index.ts +++ b/back/data/index.ts @@ -1,15 +1,22 @@ -import { Sequelize } from 'sequelize'; +import { Sequelize, Transaction } from 'sequelize'; import config from '../config/index'; export const sequelize = new Sequelize({ dialect: 'sqlite', storage: `${config.dbPath}database.sqlite`, logging: false, - pool: { - max: 6, - min: 0, - idle: 30000, + retry: { + max: 10, + match: ['SQLITE_BUSY: database is locked'], }, + pool: { + max: 5, + min: 2, + idle: 30000, + acquire: 30000, + evict: 10000, + }, + transactionType: Transaction.TYPES.IMMEDIATE, }); export type ResponseType = { code: number; data?: T; message?: string }; diff --git a/package.json b/package.json index 13d8083c..f782cab2 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "nodemailer": "^6.7.2", "p-queue": "7.2.0", "reflect-metadata": "^0.1.13", - "sequelize": "^6.20.1", + "sequelize": "^6.25.3", "serve-handler": "^6.1.3", "sockjs": "^0.3.24", "sqlite3": "npm:@louislam/sqlite3@^15.0.6", diff --git a/src/pages/crontab/index.tsx b/src/pages/crontab/index.tsx index a6070c98..89a81f42 100644 --- a/src/pages/crontab/index.tsx +++ b/src/pages/crontab/index.tsx @@ -882,7 +882,7 @@ const Crontab = () => { if (tableRef.current) { setTableScrollHeight(getTableScroll()); } - }, [tableRef.current]); + }, []); const panelContent = ( <> diff --git a/src/pages/dependence/index.tsx b/src/pages/dependence/index.tsx index ed62a336..7583b035 100644 --- a/src/pages/dependence/index.tsx +++ b/src/pages/dependence/index.tsx @@ -372,7 +372,7 @@ const Dependence = () => { if (tableRef.current) { setTableScrollHeight(getTableScroll({ extraHeight: 87 })); } - }, [tableRef.current]); + }, []); useEffect(() => { if (logDependence) { diff --git a/src/pages/env/index.tsx b/src/pages/env/index.tsx index daa31dc4..966e6251 100644 --- a/src/pages/env/index.tsx +++ b/src/pages/env/index.tsx @@ -512,7 +512,7 @@ const Env = () => { if (tableRef.current) { setTableScrollHeight(getTableScroll({ extraHeight: 87 })); } - }, [tableRef.current]); + }, []); return ( { if (tableRef.current) { setTableScrollHeight(getTableScroll()); } - }, [tableRef.current]); + }, []); return (