From 8edd94bdb57e8bed4ec9d62beaec8537084b7ae3 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Wed, 4 Jan 2023 11:07:54 +0800 Subject: [PATCH 1/4] Remove some places we are logging too much data causing sentry failures --- packages/api/src/datalayer/pubsub.ts | 2 -- packages/api/src/routers/svc/newsletters.ts | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/api/src/datalayer/pubsub.ts b/packages/api/src/datalayer/pubsub.ts index 8ef12ba83..d472e8282 100644 --- a/packages/api/src/datalayer/pubsub.ts +++ b/packages/api/src/datalayer/pubsub.ts @@ -12,7 +12,6 @@ export const createPubSubClient = (): PubsubClient => { return Promise.resolve() } - console.log(`Publishing ${topicName}`, msg) return client .topic(topicName) .publishMessage({ data: msg }) @@ -126,7 +125,6 @@ const expired = (body: PubSubRequestBody): boolean => { export const readPushSubscription = ( req: express.Request ): { message: string | undefined; expired: boolean } => { - console.log('request query', req.body) if (req.query.token !== process.env.PUBSUB_VERIFICATION_TOKEN) { console.log('query does not include valid pubsub token') return { message: undefined, expired: false } diff --git a/packages/api/src/routers/svc/newsletters.ts b/packages/api/src/routers/svc/newsletters.ts index f76536098..efc94912f 100644 --- a/packages/api/src/routers/svc/newsletters.ts +++ b/packages/api/src/routers/svc/newsletters.ts @@ -96,7 +96,12 @@ export function newsletterServiceRouter() { const result = await saveNewsletterEmail(data) if (!result) { - console.log('Error creating newsletter link from data', data) + console.log( + 'Error creating newsletter link from data', + data.email, + data.title, + data.author + ) res.status(500).send('Error creating newsletter link') return } From b438d42f38ac0ff847a64a13360c0a4f09f405b3 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Wed, 4 Jan 2023 11:18:37 +0800 Subject: [PATCH 2/4] Remove some unneeded console.log calls --- packages/api/src/utils/createTask.ts | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/packages/api/src/utils/createTask.ts b/packages/api/src/utils/createTask.ts index 8b90111ef..e8b15eccb 100644 --- a/packages/api/src/utils/createTask.ts +++ b/packages/api/src/utils/createTask.ts @@ -49,15 +49,6 @@ const createHttpTaskWithToken = async ({ priority === 'low' && (queue = `${queue}-low`) const parent = client.queuePath(project, location, queue) - console.log(`Task creation options: `, { - project, - location, - queue, - taskHandlerUrl, - serviceAccountEmail, - payload, - }) - // Convert message to buffer. let convertedPayload: string | ArrayBuffer try { @@ -118,14 +109,6 @@ export const createAppEngineTask = async ({ } const parent = client.queuePath(project, location, queue) - console.log(`App Engine task creation options: `, { - project, - location, - queue, - taskHandlerUrl, - payload, - }) - const task: protos.google.cloud.tasks.v2.ITask = { appEngineHttpRequest: { httpMethod: 'POST', From e3ed7d02501954a8a152c812202876432719482b Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Wed, 4 Jan 2023 11:23:13 +0800 Subject: [PATCH 3/4] More logging changes --- packages/api/src/routers/svc/upload.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/api/src/routers/svc/upload.ts b/packages/api/src/routers/svc/upload.ts index c2378225d..8ce2d9c51 100644 --- a/packages/api/src/routers/svc/upload.ts +++ b/packages/api/src/routers/svc/upload.ts @@ -15,7 +15,6 @@ export function uploadServiceRouter() { const router = express.Router() router.post('/:folder', async (req, res) => { - logger.info('upload data to folder', req.params.folder) const { message: msgStr, expired } = readPushSubscription(req) if (!msgStr) { @@ -38,7 +37,7 @@ export function uploadServiceRouter() { data.userId }/${DateTime.now().toFormat('yyyy-LL-dd')}/${uuidv4()}.json` - logger.info('uploading data to', filePath) + logger.info('uploading data to', { filePath }) await uploadToBucket( filePath, Buffer.from(msgStr, 'utf8'), From 2390f2d716d3798c667c53c60af8fe76c21265a6 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Wed, 4 Jan 2023 16:24:41 +0800 Subject: [PATCH 4/4] Cast data to NewsletterMessage --- packages/api/src/routers/svc/newsletters.ts | 8 +++++--- packages/api/src/services/save_newsletter_email.ts | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/api/src/routers/svc/newsletters.ts b/packages/api/src/routers/svc/newsletters.ts index efc94912f..8edba67a7 100644 --- a/packages/api/src/routers/svc/newsletters.ts +++ b/packages/api/src/routers/svc/newsletters.ts @@ -1,7 +1,10 @@ import express from 'express' import { readPushSubscription } from '../../datalayer/pubsub' import { updateConfirmationCode } from '../../services/newsletters' -import { saveNewsletterEmail } from '../../services/save_newsletter_email' +import { + NewsletterMessage, + saveNewsletterEmail, +} from '../../services/save_newsletter_email' interface SetConfirmationCodeMessage { emailAddress: string @@ -81,8 +84,7 @@ export function newsletterServiceRouter() { try { // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment - const data = JSON.parse(message) - + const data = JSON.parse(message) as NewsletterMessage if ( !('email' in data) || !('content' in data) || diff --git a/packages/api/src/services/save_newsletter_email.ts b/packages/api/src/services/save_newsletter_email.ts index 365877d08..eb14c6c4c 100644 --- a/packages/api/src/services/save_newsletter_email.ts +++ b/packages/api/src/services/save_newsletter_email.ts @@ -14,7 +14,7 @@ import { fetchFavicon } from '../utils/parser' import { updatePage } from '../elastic/pages' import { isBase64Image } from '../utils/helpers' -interface NewsletterMessage { +export interface NewsletterMessage { email: string content: string url: string