From d1438fe800ce653831cefaca513cf96c02b1526a Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Wed, 17 Jan 2024 11:47:31 +0800 Subject: [PATCH] Remove old code, clean up redis logging --- packages/api/src/queue-processor.ts | 8 +++++ packages/api/src/redis_data_source.ts | 4 --- packages/api/src/routers/svc/rss_feed.ts | 39 ------------------------ 3 files changed, 8 insertions(+), 43 deletions(-) diff --git a/packages/api/src/queue-processor.ts b/packages/api/src/queue-processor.ts index 1b8974984..512462421 100644 --- a/packages/api/src/queue-processor.ts +++ b/packages/api/src/queue-processor.ts @@ -96,6 +96,14 @@ const main = async () => { console.log('completed job: ', job.jobId) }) + workerRedisClient.on('error', (error) => { + console.trace('[queue-processor]: redis worker error', { error }) + }) + + redisClient.on('error', (error) => { + console.trace('[queue-processor]: redis error', { error }) + }) + const gracefulShutdown = async (signal: string) => { console.log(`[queue-processor]: Received ${signal}, closing server...`) server.close(async () => { diff --git a/packages/api/src/redis_data_source.ts b/packages/api/src/redis_data_source.ts index 48ce99a69..809aebc88 100644 --- a/packages/api/src/redis_data_source.ts +++ b/packages/api/src/redis_data_source.ts @@ -25,10 +25,6 @@ export class RedisDataSource { this.workerRedisClient = createIORedisClient(this.options) this.isInitialized = true - this.redisClient?.on('close', () => { - console.trace('closing redis client') - }) - return this } diff --git a/packages/api/src/routers/svc/rss_feed.ts b/packages/api/src/routers/svc/rss_feed.ts index 5d0f0d8b4..14052697e 100644 --- a/packages/api/src/routers/svc/rss_feed.ts +++ b/packages/api/src/routers/svc/rss_feed.ts @@ -36,45 +36,6 @@ export function rssFeedRouter() { console.log('unable to fetchAll feeds, redis is not configured') return res.status(500).send('Expired') } - - // // get active rss feed subscriptions scheduled for fetch and group by feed url - // const subscriptionGroups = (await getRepository(Subscription).query( - // ` - // SELECT - // url, - // ARRAY_AGG(id) AS "subscriptionIds", - // ARRAY_AGG(user_id) AS "userIds", - // ARRAY_AGG(last_fetched_at) AS "fetchedDates", - // ARRAY_AGG(coalesce(scheduled_at, NOW())) AS "scheduledDates", - // ARRAY_AGG(last_fetched_checksum) AS checksums, - // ARRAY_AGG(fetch_content) AS "fetchContents", - // ARRAY_AGG(coalesce(folder, $3)) AS folders - // FROM - // omnivore.subscriptions - // WHERE - // type = $1 - // AND status = $2 - // AND (scheduled_at <= NOW() OR scheduled_at IS NULL) - // GROUP BY - // url - // `, - // [ - // SubscriptionType.Rss, - // SubscriptionStatus.Active, - // DEFAULT_SUBSCRIPTION_FOLDER, - // ] - // )) as RssSubscriptionGroup[] - - // // create a cloud taks to fetch rss feed item for each subscription - // await Promise.all( - // subscriptionGroups.map((subscriptionGroup) => { - // try { - // return enqueueRssFeedFetch(subscriptionGroup) - // } catch (error) { - // logger.info('error creating rss feed fetch task', error) - // } - // }) - // ) } catch (error) { logger.info('error fetching rss feeds', error) return res.status(500).send('Internal Server Error')