natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
ThatOneCalculator 2023-06-28 23:04:50 -07:00
parent 5343c14184 2d4eda2c1d
commit 97e74198ff
No known key found for this signature in database
GPG Key ID: 8703CACD01000000
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/backend/src/config/types.ts
View File

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

4
packages/backend/src/db/postgre.ts
View File

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

2
packages/backend/src/db/redis.ts
View File

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

4
packages/backend/src/queue/initialize.ts
View File

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