Mirror/SponsorBlockServer
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlockServer.git synced 2025-12-26 17:38:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
SashaXser
2024-01-20 07:07:03 +04:00
committed by GitHub
parent 5b95aa8aba fce311377f
commit a8010b553d
6 changed files with 376 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/utils/redis.ts
View File

@@ -53,7 +53,7 @@ const writeResponseTime: number[] = [];
let lastResponseTimeLimit = 0;
const maxStoredTimes = 200;
export class TooManyActiveConnectionsError extends Error { }
export class TooManyActiveConnectionsError extends Error {}
export let connectionPromise = Promise.resolve();
@@ -106,7 +106,7 @@ if (config.redis?.enabled) {
readResponseTime.push(responseTime);
if (readResponseTime.length > maxStoredTimes) readResponseTime.shift();
if (config.redis.stopWritingAfterResponseTime
&& responseTime > config.redis.stopWritingAfterResponseTime) {
&& responseTime > config.redis.stopWritingAfterResponseTime) {
Logger.error(`Hit response time limit at ${responseTime}ms`);
lastResponseTimeLimit = Date.now();
}
@@ -126,7 +126,7 @@ if (config.redis?.enabled) {
new Promise((resolve, reject) => {
if ((config.redis.maxWriteConnections && activeRequests > config.redis.maxWriteConnections)
|| (config.redis.responseTimePause
&& Date.now() - lastResponseTimeLimit < config.redis.responseTimePause)) {
&& Date.now() - lastResponseTimeLimit < config.redis.responseTimePause)) {
reject(`Too many active requests to write due to ${activeRequests} requests and ${Date.now() - lastResponseTimeLimit}ms since last limit. ${(db as Postgres)?.getStats?.()?.activeRequests} active db requests with ${(db as Postgres)?.getStats?.()?.avgReadTime}ms`);
return;
}
@@ -162,7 +162,7 @@ if (config.redis?.enabled) {
.catch((err) => reject(err))
);
/* istanbul ignore next */
client.on("error", function (error) {
client.on("error", function(error) {
lastClientFail = Date.now();
Logger.error(`Redis Error: ${error}`);
});
@@ -171,7 +171,7 @@ if (config.redis?.enabled) {
Logger.info("Redis: trying to reconnect");
});
/* istanbul ignore next */
readClient?.on("error", function (error) {
readClient?.on("error", function(error) {
lastReadFail = Date.now();
Logger.error(`Redis Read-Only Error: ${error}`);
});
@@ -186,7 +186,7 @@ function pickChoice<T>(client: T, readClient: T): T {
const ignoreReadDueToFailure = lastReadFail > Date.now() - 1000 * 30;
const readDueToFailure = lastClientFail > Date.now() - 1000 * 30;
if (readAvailable && !ignoreReadDueToFailure && (readDueToFailure ||
Math.random() > 1 / (config.redisRead?.weight + 1))) {
Math.random() > 1 / (config.redisRead?.weight + 1))) {
return readClient;
} else {
return client;