fix(download-logs): retry download logs fixes #711

Author: Dawid

src/cloudmanager-helpers.js

@@ -14,7 +14,7 @@ const Config = require('@adobe/aio-lib-core-config')
 const { init } = require('@adobe/aio-lib-cloudmanager')
 const { cli } = require('cli-ux')
 const { context, getToken, Ims } = require('@adobe/aio-lib-ims')
-const logger = require('@adobe/aio-lib-core-logging')('@adobe/aio-lib-cloudmanager', { provider: 'debug' })
+const logger = require('@adobe/aio-lib-core-logging')('@adobe/aio-lib-cloudmanager', { level: process.env.LOG_LEVEL })
 const moment = require('moment')
 const _ = require('lodash')
 const { CLI } = require('@adobe/aio-lib-ims/src/context')
@@ -307,35 +307,16 @@ function handleError (_error, errorFn) {
   })
 }
 
-async function executeWithRetries (fn, maxRetries = 5) {
-  let retries = 0
-  let startTime = Date.now()
-  while (retries < maxRetries) {
+async function executeWithRetry (fn, retries = 3, delay = 1000) {
+  for (let i = 0; i < retries; i++) {
     try {
       return await fn()
     } catch (error) {
-      if (error.sdkDetails && error.sdkDetails.response && (error.sdkDetails.response.status === 401 || error.sdkDetails.response.status === 403)) {
-        logger.debug('Received 401, 403 error, retrying.')
-      } else {
-        throw error
-      }
-      if (shouldResetRetires(startTime)) {
-        retries = 0
-        startTime = Date.now()
-      }
-      retries++
+      logger.debug(`Retrying due to error: ${error.message || 'Unknown error'} (attempt ${i + 1}/${retries})`)
+      if (i === retries - 1) throw error
+      await new Promise(resolve => setTimeout(resolve, delay))
     }
   }
-  throw new validationCodes.MAX_RETRY_REACHED()
-}
-
-function shouldResetRetires (startTime, resetInterval = 3600000) {
-  const elapsedTime = Date.now() - startTime
-  if (elapsedTime >= resetInterval) {
-    logger.debug(`Resetting retries after ${resetInterval / 1000} seconds.`)
-    return true
-  }
-  return false
 }
 
 module.exports = {
@@ -360,5 +341,5 @@ module.exports = {
   getActiveOrganizationId,
   getFullOrgIdentity,
   handleError,
-  executeWithRetries,
+  executeWithRetry,
 }

src/commands/cloudmanager/environment/download-logs.js

@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
 */
 
 const { flags } = require('@oclif/command')
-const { initSdk, getProgramId, sanitizeEnvironmentId } = require('../../../cloudmanager-helpers')
+const { initSdk, getProgramId, sanitizeEnvironmentId, executeWithRetry } = require('../../../cloudmanager-helpers')
 const { cli } = require('cli-ux')
 const path = require('path')
 const commonFlags = require('../../../common-flags')
@@ -50,8 +50,10 @@ class DownloadLogs extends BaseCommand {
   }
 
   async downloadLogs (programId, environmentId, service, logName, days, outputDirectory, imsContextName = null) {
-    const sdk = await initSdk(imsContextName)
-    return sdk.downloadLogs(programId, environmentId, service, logName, days, outputDirectory)
+    return executeWithRetry(async () => {
+      const sdk = await initSdk(imsContextName)
+      return sdk.downloadLogs(programId, environmentId, service, logName, days, outputDirectory)
+    })
   }
 }
 

src/commands/cloudmanager/environment/tail-log.js

@@ -11,7 +11,9 @@ governing permissions and limitations under the License.
 */
 
 const BaseCommand = require('../../../base-command')
-const { initSdk, getProgramId, sanitizeEnvironmentId, executeWithRetries } = require('../../../cloudmanager-helpers')
+const { initSdk, getProgramId, sanitizeEnvironmentId } = require('../../../cloudmanager-helpers')
+const logger = require('@adobe/aio-lib-core-logging')('@adobe/aio-lib-cloudmanager', { level: process.env.LOG_LEVEL })
+const { codes: validationCodes } = require('../../../ValidationErrors')
 const commonFlags = require('../../../common-flags')
 const commonArgs = require('../../../common-args')
 
@@ -38,6 +40,37 @@ class TailLog extends BaseCommand {
   }
 }
 
+async function executeWithRetries (fn, maxRetries = 5) {
+  let retries = 0
+  let startTime = Date.now()
+  while (retries < maxRetries) {
+    try {
+      return await fn()
+    } catch (error) {
+      if (error.sdkDetails && error.sdkDetails.response && (error.sdkDetails.response.status === 401 || error.sdkDetails.response.status === 403)) {
+        logger.debug('Received 401, 403 error, retrying.')
+      } else {
+        throw error
+      }
+      if (shouldResetRetires(startTime)) {
+        retries = 0
+        startTime = Date.now()
+      }
+      retries++
+    }
+  }
+  throw new validationCodes.MAX_RETRY_REACHED()
+}
+
+function shouldResetRetires (startTime, resetInterval = 3600000) {
+  const elapsedTime = Date.now() - startTime
+  if (elapsedTime >= resetInterval) {
+    logger.debug(`Resetting retries after ${resetInterval / 1000} seconds.`)
+    return true
+  }
+  return false
+}
+
 TailLog.description = 'outputs a stream of log data for the specified environment, service and log name'
 
 TailLog.args = [