Add default logger + log boolean to CN asyncretry wrapper + renaming [Content Node]

creator-node/src/components/tracks/TrackTranscodeHandoffManager.js

@@ -238,7 +238,7 @@ class TrackTranscodeHandoffManager {
           return resp
         }
       },
-      asyncFnLabel: 'polling transcode',
+      logLabel: 'polling transcode',
       options: {
         retries: POLLING_TRANSCODE_AND_SEGMENTS_RETRIES,
         minTimeout: POLLING_TRANSCODE_AND_SEGMENTS_MIN_TIMEOUT,
@@ -373,7 +373,7 @@ class TrackTranscodeHandoffManager {
           timeout: SEND_TRANSCODE_AND_SEGMENT_REQUEST_TIMEOUT_MS
         })
       },
-      asyncFnLabel: 'transcode and segment'
+      logLabel: 'transcode and segment'
     })
 
     return resp.data.data.uuid
@@ -431,7 +431,7 @@ class TrackTranscodeHandoffManager {
             timeout: FETCH_PROCESSING_STATUS_TIMEOUT_MS
           })
         },
-        asyncFnLabel: 'fetch track content processing status'
+        logLabel: 'fetch track content processing status'
       })
 
     return body.data
@@ -467,7 +467,7 @@ class TrackTranscodeHandoffManager {
           timeout: FETCH_STREAM_TIMEOUT_MS
         })
       },
-      asyncFnLabel: 'fetch segment'
+      logLabel: 'fetch segment'
     })
   }
 
@@ -501,7 +501,7 @@ class TrackTranscodeHandoffManager {
           timeout: FETCH_STREAM_TIMEOUT_MS
         })
       },
-      asyncFnLabel: 'fetch transcode'
+      logLabel: 'fetch transcode'
     })
   }
 
@@ -535,7 +535,7 @@ class TrackTranscodeHandoffManager {
           timeout: FETCH_STREAM_TIMEOUT_MS
         })
       },
-      asyncFnLabel: 'fetch m3u8'
+      logLabel: 'fetch m3u8'
     })
   }
 
@@ -560,7 +560,7 @@ class TrackTranscodeHandoffManager {
    * @param {Object} param
    * @param {Object} param.logger
    * @param {func} param.asyncFn the fn to asynchronously retry
-   * @param {string} param.asyncFnLabel the task label used to print on retry. used for debugging purposes
+   * @param {string} param.logLabel the task label used to print on retry. used for debugging purposes
    * @param {Object} param.options optional options. defaults to the params listed below if not explicitly passed in
    * @param {number} [param.options.factor=2] the exponential factor
    * @param {number} [param.options.retries=5] the max number of retries. defaulted to 5
@@ -572,7 +572,7 @@ class TrackTranscodeHandoffManager {
   static asyncRetryNotOn404({
     logger,
     asyncFn: inputAsyncFn,
-    asyncFnLabel,
+    logLabel,
     options = {}
   }) {
     const asyncFn = async (bail) => {
@@ -593,7 +593,7 @@ class TrackTranscodeHandoffManager {
       return resp
     }
 
-    return Utils.asyncRetry({ logger, asyncFn, asyncFnLabel, options })
+    return Utils.asyncRetry({ logger, asyncFn, logLabel, options })
   }
 }
 

creator-node/src/snapbackSM/peerSetManager.js

@@ -127,7 +127,7 @@ class PeerSetManager {
     try {
       // Request all users that have this node as a replica (either primary or secondary)
       const resp = await Utils.asyncRetry({
-        asyncFnLabel: 'fetch all users with this node in replica',
+        logLabel: 'fetch all users with this node in replica',
         asyncFn: async () => {
           return axios({
             method: 'get',

creator-node/src/snapbackSM/snapbackSM.js

@@ -1909,7 +1909,7 @@ class SnapbackSM {
     try {
       // Request all users that have this node as a replica (either primary or secondary)
       const resp = await Utils.asyncRetry({
-        asyncFnLabel: 'fetch all users with this node in replica',
+        logLabel: 'fetch all users with this node in replica',
         asyncFn: async () => {
           return axios({
             method: 'get',

creator-node/src/utils.js

@@ -7,6 +7,7 @@ const stream = require('stream')
 const retry = require('async-retry')
 const { promisify } = require('util')
 const pipeline = promisify(stream.pipeline)
+const { logger: genericLogger } = require('./logging.js')
 
 const models = require('./models')
 const redis = require('./redis')
@@ -350,26 +351,35 @@ function currentNodeShouldHandleTranscode({
  *
  * options described here https://github.com/tim-kos/node-retry#retrytimeoutsoptions
  * @param {Object} param
- * @param {Object} param.logger
  * @param {func} param.asyncFn the fn to asynchronously retry
- * @param {string} param.asyncFnLabel the task label used to print on retry. used for debugging purposes
  * @param {Object} param.options optional options. defaults to the params listed below if not explicitly passed in
  * @param {number} [param.options.factor=2] the exponential factor
  * @param {number} [param.options.retries=5] the max number of retries. defaulted to 5
  * @param {number} [param.options.minTimeout=1000] minimum number of ms to wait after first retry. defaulted to 1000ms
  * @param {number} [param.options.maxTimeout=5000] maximum number of ms between two retries. defaulted to 5000ms
  * @param {func} [param.options.onRetry] fn that gets called per retry
+ * @param {Object} param.logger
+ * @param {Boolean} param.log enables/disables logging
+ * @param {string?} param.logLabel
  * @returns the fn response if success, or throws an error
  */
-function asyncRetry({ logger, asyncFn, asyncFnLabel, options = {} }) {
+function asyncRetry({
+  asyncFn,
+  options = {},
+  logger = genericLogger,
+  log = true,
+  logLabel = null
+}) {
   options = {
     retries: 5,
     factor: 2,
     minTimeout: 1000,
     maxTimeout: 5000,
     onRetry: (err, i) => {
-      if (err) {
-        logger.warn(`${asyncFnLabel} ${i} retry error: `, err)
+      if (err && log) {
+        const logPrefix =
+          (logLabel ? `[${logLabel}] ` : '') + `[asyncRetry] [attempt #${i}]`
+        logger.warn(`${logPrefix}: `, err)
       }
     },
     ...options