run linter
This commit is contained in:
parent
dad0365d08
commit
be1b861122
|
@ -3,7 +3,7 @@ import { createRedisConnection } from "./built/redis.js";
|
|||
|
||||
const config = loadConfig();
|
||||
const redis = createRedisConnection({
|
||||
...config
|
||||
...config,
|
||||
});
|
||||
|
||||
redis.on("connect", () => redis.disconnect());
|
||||
|
|
|
@ -188,11 +188,12 @@ export const entities = [
|
|||
const log = process.env.NODE_ENV !== "production";
|
||||
|
||||
export const db = new DataSource({
|
||||
|
||||
type: "postgres",
|
||||
...(process.env.DATABASE_URL ? {
|
||||
url: process.env.DATABASE_URL
|
||||
} : {
|
||||
...(process.env.DATABASE_URL
|
||||
? {
|
||||
url: process.env.DATABASE_URL,
|
||||
}
|
||||
: {
|
||||
host: config.db.host,
|
||||
port: config.db.port,
|
||||
username: config.db.user,
|
||||
|
@ -209,9 +210,11 @@ export const db = new DataSource({
|
|||
? {
|
||||
type: "ioredis",
|
||||
port: process.env.REDIS_URL, // typeorm passes "port" as the first argument to ioredis when using the "ioredis" cache driver so we can use it to pass the redis url
|
||||
options: process.env.REDIS_URL ? {
|
||||
options: process.env.REDIS_URL
|
||||
? {
|
||||
keyPrefix: `${config.redis.prefix}:query:`,
|
||||
} : {
|
||||
}
|
||||
: {
|
||||
host: config.redis.host,
|
||||
port: config.redis.port,
|
||||
family: config.redis.family == null ? 0 : config.redis.family,
|
||||
|
|
|
@ -16,7 +16,7 @@ export function createConnection() {
|
|||
keyPrefix: `${source.prefix}:`,
|
||||
db: source.db || 0,
|
||||
tls: source.tls,
|
||||
}
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -4,9 +4,11 @@ import { entities } from "./db/postgre.js";
|
|||
|
||||
export default new DataSource({
|
||||
type: "postgres",
|
||||
...(process.env.DATABASE_URL ? {
|
||||
url: process.env.DATABASE_URL
|
||||
} : {
|
||||
...(process.env.DATABASE_URL
|
||||
? {
|
||||
url: process.env.DATABASE_URL,
|
||||
}
|
||||
: {
|
||||
host: config.db.host,
|
||||
port: config.db.port,
|
||||
username: config.db.user,
|
||||
|
|
|
@ -2,11 +2,10 @@ import Bull from "bull";
|
|||
import config from "@/config/index.js";
|
||||
|
||||
export function initialize<T>(name: string, limitPerSec = -1) {
|
||||
return new Bull<T>(
|
||||
name,
|
||||
process.env.REDIS_URL,
|
||||
{
|
||||
redis: process.env.REDIS_URL ? undefined : {
|
||||
return new Bull<T>(name, process.env.REDIS_URL, {
|
||||
redis: process.env.REDIS_URL
|
||||
? undefined
|
||||
: {
|
||||
port: config.redis.port,
|
||||
host: config.redis.host,
|
||||
family: config.redis.family == null ? 0 : config.redis.family,
|
||||
|
@ -30,8 +29,7 @@ export function initialize<T>(name: string, limitPerSec = -1) {
|
|||
apBackoff,
|
||||
},
|
||||
},
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
// ref. https://github.com/misskey-dev/misskey/pull/7635#issue-971097019
|
||||
|
|
Loading…
Reference in New Issue