prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3545 from omnivore-app/fix/pg-pool-connection-timeout

Browse source 
fix/pg pool connection timeout
This commit is contained in:
Hongbo Wu 2024-02-21 14:37:36 +08:00 committed by GitHub
commit e386c35ea2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/api/src/data_source.ts
View file

@ -16,9 +16,11 @@ export const appDataSource = new DataSource({
subscribers: [__dirname + '/events/**/*{.js,.ts}'],
namingStrategy: new SnakeNamingStrategy(),
logger: new CustomTypeOrmLogger(['query', 'info']),
connectTimeoutMS: 40000, // 40 seconds
connectTimeoutMS: 10000, // 10 seconds
maxQueryExecutionTime: 10000, // 10 seconds
extra: {
options: process.env.PG_EXTRA_OPTIONS,
max: env.pg.pool.max,
idleTimeoutMillis: 10000, // 10 seconds
},
})

17
packages/api/src/queue-processor.ts
View file

@ -140,23 +140,6 @@ const main = async () => {
mq: env.redis.mq,
})
appDataSource.setOptions({
type: 'postgres',
host: env.pg.host,
port: env.pg.port,
schema: 'omnivore',
username: env.pg.userName,
password: env.pg.password,
database: env.pg.dbName,
logging: ['query', 'info'],
entities: [__dirname + '/entity/**/*{.js,.ts}'],
subscribers: [__dirname + '/events/**/*{.js,.ts}'],
namingStrategy: new SnakeNamingStrategy(),
logger: new CustomTypeOrmLogger(['query', 'info']),
connectTimeoutMS: 40000, // 40 seconds
maxQueryExecutionTime: 10000, // 10 seconds
})
// respond healthy to auto-scaler.
app.get('/_ah/health', (req, res) => res.sendStatus(200))