Merge branch 'develop' of codeberg.org:calckey/calckey into develop

This commit is contained in:
ThatOneCalculator 2023-06-28 23:04:50 -07:00
commit 9996c69c06
4 changed files with 7 additions and 7 deletions

View File

@ -20,11 +20,11 @@ export type Source = {
host: string;
port: number;
family?: number;
pass: string;
pass?: string;
db?: number;
prefix?: string;
user?: string;
tls?: { [x: string]: string };
tls?: { [y: string]: string };
};
elasticsearch: {
host: string;

View File

@ -207,11 +207,11 @@ export const db = new DataSource({
host: config.redis.host,
port: config.redis.port,
family: config.redis.family == null ? 0 : config.redis.family,
user: config.redis.user ?? "default",
username: config.redis.user ?? "default",
password: config.redis.pass,
keyPrefix: `${config.redis.prefix}:query:`,
db: config.redis.db || 0,
tls: config.redis.tls || {},
tls: config.redis.tls,
},
}
: false,

View File

@ -10,7 +10,7 @@ export function createConnection() {
username: config.redis.user ?? "default",
keyPrefix: `${config.redis.prefix}:`,
db: config.redis.db || 0,
tls: config.redis.tls || {},
tls: config.redis.tls,
});
}

View File

@ -7,10 +7,10 @@ export function initialize<T>(name: string, limitPerSec = -1) {
port: config.redis.port,
host: config.redis.host,
family: config.redis.family == null ? 0 : config.redis.family,
user: config.redis.user ?? "default",
username: config.redis.user ?? "default",
password: config.redis.pass,
db: config.redis.db || 0,
tls: config.redis.tls || {},
tls: config.redis.tls,
},
prefix: config.redis.prefix ? `${config.redis.prefix}:queue` : "queue",
limiter: