Add logger to rebuild vocabs and chore tasks #21 #5

Author: sroertgen

src/commonChoreForVocabs.js

@@ -2,6 +2,7 @@ const fs = require("fs-extra")
 const path = require('path');
 const { gitHubApiHeaders } = require("./common.js")
 const types = require("./types.js")
+const logger = require("./logger.js")
 
 
 /** get all json data from dist/build folder
@@ -21,7 +22,7 @@ const readBuildDir = async () => {
 
     return jsonObjects;
   } catch (err) {
-    console.error('Error:', err);
+    logger.error(`Error: ${err}`);
     throw err;
   }
 }
@@ -60,15 +61,15 @@ async function checkIfBranchExists(repository, ref) {
     .then(data => {
       const branchExists = data.some(branch => branch.name === branchName);
       if (branchExists) {
-        console.log(`${repository}/${branchName} exists!`);
+        // console.log(`${repository}/${branchName} exists!`);
         return true
       } else {
-        console.log(`Branch "${branchName}" does not exist.`);
+        logger.error(`Branch "${branchName}" does not exist.`);
         return false
       }
     })
     .catch(error => {
-      console.error(`Fetch error for repo ${repository} and branch ${branchName}, ${error}`);
+      logger.error(`Fetch error for repo ${repository} and branch ${branchName}, ${error}`);
       return false
     });
   return result

src/rebuildVocabs.js

@@ -1,8 +1,8 @@
 const fs = require("fs-extra")
-const path = require('path');
-const { securePayload, gitHubApiHeaders } = require("./common.js")
+const { securePayload } = require("./common.js")
 const { readBuildDir, sortBuildInfo, checkIfBranchExists } = require("./commonChoreForVocabs.js")
 const types = require("./types.js")
+const logger = require("./logger.js")
 require("dotenv").config()
 
 const { SECRET, BUILD_URL, REBUILD_MAX_ATTEMPTS } = process.env
@@ -46,7 +46,7 @@ const sendBuildRequest = async (buildInfo) => {
     const respBody = await response.text()
     // get url from response
     const responseUrl = protocolizeUrl(respBody.substring(17))
-    console.log("Build Urls:", responseUrl)
+    logger.info(`Build Urls: ${responseUrl}`)
     const url = new URL(responseUrl)
     const id = url.searchParams.get("id")
 
@@ -56,7 +56,7 @@ const sendBuildRequest = async (buildInfo) => {
       ref: buildInfo.ref
     }
   } catch (error) {
-    console.error("Error sending request", error)
+    logger.error(`Error sending request ${error} `)
     return {
       id: null,
       repository: buildInfo.repository,
@@ -66,11 +66,7 @@ const sendBuildRequest = async (buildInfo) => {
 }
 
 /**
- * @param {{
- * id: string
- * repository: string
- * ref: string
- * }} buildInfo
+ * @param {types.BuildInfo} buildInfo
  */
 const checkBuildStatus = (buildInfo) => {
   const maxAttempts = REBUILD_MAX_ATTEMPTS ? Number(REBUILD_MAX_ATTEMPTS) : 30
@@ -81,15 +77,18 @@ const checkBuildStatus = (buildInfo) => {
       const response = fs.readFileSync(`./dist/build/${buildInfo.id}.json`)
       /** @type {BuildInfo} */
       json = JSON.parse(response)
-      if (json.status === "complete" || json.status === "error") {
-        console.log(`${json.repository}, ${json.ref}: Finish with status: ${json.status} (ID: ${buildInfo.id})`)
+      if (json.status === "complete") {
+        logger.info(`${json.repository}, ${json.ref}: Finish with status: ${json.status} (ID: ${buildInfo.id})`)
+        return
+      } else if (json.status === "error") {
+        logger.error(`${json.repository}, ${json.ref}: Finish with status: ${json.status} (ID: ${buildInfo.id})`)
         return
       } else {
         throw new Error("Not completed")
       }
     } catch (error) {
       if (attempts > maxAttempts || !buildInfo.id) {
-        console.log(`${buildInfo.repository}, ${buildInfo.ref}: did not finish after ${attempts} attempts. Aborting. Error: ${error} (ID: ${buildInfo.id})`)
+        logger.info(`${buildInfo.repository}, ${buildInfo.ref}: did not finish after ${attempts} attempts.Aborting.Error: ${error} (ID: ${buildInfo.id})`)
         return
       }
       setTimeout(() => {