resolve conflicts

This commit is contained in:
Hongbo Wu
2024-01-25 17:40:25 +08:00
parent e4e07c8acf
commit 52419c39da
2 changed files with 2 additions and 8 deletions

View File

@ -24,8 +24,6 @@ import { CreateTaskError } from './errors'
import { stringToHash } from './helpers'
import { logger } from './logger'
import View = google.cloud.tasks.v2.Task.View
import { getBackendQueue } from '../queue-processor'
import { THUMBNAIL_JOB } from '../jobs/find_thumbnail'
// Instantiates a client.
const client = new CloudTasksClient()

View File

@ -26,10 +26,6 @@ export class RedisDataSource {
createIORedisClient('mq', this.options) || this.cacheClient // if mq is not defined, use cache
}
setOptions(options: RedisDataSourceOptions): void {
this.options = options
}
async shutdown(): Promise<void> {
try {
await this.queueRedisClient?.quit()
@ -72,8 +68,8 @@ const createIORedisClient = (
export const redisDataSource = new RedisDataSource({
cache: {
url: process.env.REDIS_CACHE_URL,
cert: process.env.REDIS_CACHE_CERT,
url: process.env.REDIS_URL,
cert: process.env.REDIS_CERT,
},
mq: {
url: process.env.MQ_REDIS_URL,