diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-03-24 11:26:36 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-03-24 11:26:36 +0000 |
| commit | beb00789dff0e85eb2be21f613edcb8036ba9e14 (patch) | |
| tree | 38cd1f654b90e321a774b31e3c9ae238bbf62ef3 /packages/backend | |
| parent | Merge remote-tracking branch 'misskey/develop' into future-2024-03-14 (diff) | |
| parent | merge: always align code to the left - fixes #436 (!453) (diff) | |
| download | sharkey-beb00789dff0e85eb2be21f613edcb8036ba9e14.tar.gz sharkey-beb00789dff0e85eb2be21f613edcb8036ba9e14.tar.bz2 sharkey-beb00789dff0e85eb2be21f613edcb8036ba9e14.zip | |
Merge branch 'develop' into future-2024-03-23
Diffstat (limited to 'packages/backend')
| -rw-r--r-- | packages/backend/ormconfig.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/backend/ormconfig.js b/packages/backend/ormconfig.js index 229e5bf1fe..c88b3b3d65 100644 --- a/packages/backend/ormconfig.js +++ b/packages/backend/ormconfig.js @@ -11,7 +11,11 @@ export default new DataSource({ username: config.db.user, password: config.db.pass, database: config.db.db, - extra: config.db.extra, + extra: { + ...config.db.extra, + // migrations may be very slow, give them longer to run (that 10*1000 comes from postgres.ts) + statement_timeout: (config.db.extra?.statement_timeout ?? 1000 * 10) * 10, + }, entities: entities, migrations: ['migration/*.js'], }); |