Mirror/SponsorBlockServer
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlockServer.git synced 2025-12-09 13:07:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use pool query since this should catch idle errors

Browse Source 
https://github.com/brianc/node-postgres/issues/1324#issuecomment-623311914

Helps with https://github.com/ajayyy/SponsorBlockServer/issues/487
This commit is contained in:
Ajay
2022-07-20 00:31:51 -04:00
parent 288f7d45e7
commit f4b66d30ec
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/databases/Postgres.ts
View File

@@ -94,10 +94,8 @@ export class Postgres implements IDatabase {
Logger.debug(`prepare (postgres): type: ${type}, query: ${query}, params: ${params}`);
let client: PoolClient;
try {
client = await this.getClient(type);
const queryResult = await client.query({ text: query, values: params });
const queryResult = await this.getPool(type).query({ text: query, values: params });
switch (type) {
case "get": {
@@ -116,24 +114,18 @@ export class Postgres implements IDatabase {
}
} catch (err) {
Logger.error(`prepare (postgres): ${err}`);
} finally {
try {
client?.release();
} catch (err) {
Logger.error(`prepare (postgres): ${err}`);
}
}
}
private getClient(type: string): Promise<PoolClient> {
private getPool(type: string): Pool {
const readAvailable = this.poolRead && (type === "get" || type === "all");
const ignroreReadDueToFailure = this.lastPoolReadFail > Date.now() - 1000 * 30;
const readDueToFailure = this.lastPoolFail > Date.now() - 1000 * 30;
if (readAvailable && !ignroreReadDueToFailure && (readDueToFailure ||
Math.random() > 1 / (this.config.postgresReadOnly.weight + 1))) {
return this.poolRead.connect();
return this.poolRead;
} else {
return this.pool.connect();
return this.pool;
}
}