Merge pull request #56 from BonnierNews/fix/logging-stuff

Fix some logging

lib/message-handler.js

@@ -40,6 +40,8 @@ export default async function messageHandler(recipeMap, req, res) {
 
   const { logger } = context;
 
+  logger.info(`incoming message ${JSON.stringify(messageData)}`);
+
   const handleError = async (error) => {
     if (error.rejected) {
       logger.error(
@@ -98,13 +100,12 @@ export default async function messageHandler(recipeMap, req, res) {
         return res.status(200).send();
       }
     } catch (err) {
-      logger.error(`Firebase error: ${JSON.stringify(err)}`);
+      logger.error(`Firestore error: ${err.code} ${err.message}`);
       return res.status(502).send({ error: err });
     }
   }
   metrics.messages.inc();
 
-  logger.info(`incoming message ${JSON.stringify(messageData)}`);
   const parts = key.split(".");
   const suffix = parts.pop();
   const [ prefix ] = parts;

lib/publish-message.js

@@ -9,7 +9,7 @@ const pubSubClient = config.pubSub ? new PubSub({ apiEndpoint: config.pubSub.api
 const cleanupAttributes = (attributes) => JSON.parse(JSON.stringify(attributes));
 
 export default async function publishMessage(message, attributes) {
-  const logger = buildLogger(message.correlationId);
+  const logger = buildLogger(attributes.correlationId);
   const messageId = await publishPubsubMessage(
     pubSubClient.topic(config.topic),
     { json: message, attributes: cleanupAttributes({ ...attributes, topic: config.topic, idempotencyKey: uuid.v4() }) },
@@ -19,7 +19,7 @@ export default async function publishMessage(message, attributes) {
 }
 
 export async function rejectMessage(message, attributes) {
-  const logger = buildLogger(message.correlationId);
+  const logger = buildLogger(attributes.correlationId);
   const messageId = await publishPubsubMessage(
     pubSubClient.topic(config.deadLetterTopic),
     { json: message, attributes: cleanupAttributes({ ...attributes, topic: config.topic }) },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bonniernews/b0rker",
-  "version": "7.2.0",
+  "version": "7.2.1",
   "engines": {
     "node": ">=16"
   },