mirror of
				https://github.com/strapi/strapi.git
				synced 2025-11-04 03:43:34 +00:00 
			
		
		
		
	Fix duplicate errors being logged
This commit is contained in:
		
							parent
							
								
									1a4b57b366
								
							
						
					
					
						commit
						eb6e6db843
					
				@ -65,7 +65,7 @@
 | 
			
		||||
    "@types/uuid": "9.0.0",
 | 
			
		||||
    "koa": "2.13.4",
 | 
			
		||||
    "@types/koa": "2.13.4",
 | 
			
		||||
    "knex": "1.0.7",
 | 
			
		||||
    "knex": "2.4.0",
 | 
			
		||||
    "rimraf": "3.0.2",
 | 
			
		||||
    "typescript": "4.6.2"
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
@ -112,7 +112,7 @@ module.exports = async (opts) => {
 | 
			
		||||
    logger.log(`Export archive is in ${chalk.green(outFile)}`);
 | 
			
		||||
  } catch {
 | 
			
		||||
    await strapi.telemetry.send('didDEITSProcessFail', getTelemetryPayload());
 | 
			
		||||
    logger.error('Export process failed');
 | 
			
		||||
    logger.error('Export process failed.');
 | 
			
		||||
    process.exit(1);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -112,8 +112,7 @@ module.exports = async (opts) => {
 | 
			
		||||
    logger.info('Import process has been completed successfully!');
 | 
			
		||||
  } catch (e) {
 | 
			
		||||
    await strapiInstance.telemetry.send('didDEITSProcessFail', getTelemetryPayload());
 | 
			
		||||
    logger.error('Import process failed unexpectedly');
 | 
			
		||||
    logger.error(e);
 | 
			
		||||
    logger.error('Import process failed.');
 | 
			
		||||
    process.exit(1);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -123,8 +123,7 @@ module.exports = async (opts) => {
 | 
			
		||||
    logger.log(`${chalk.bold('Transfer process has been completed successfully!')}`);
 | 
			
		||||
    process.exit(0);
 | 
			
		||||
  } catch (e) {
 | 
			
		||||
    logger.error('Transfer process failed unexpectedly');
 | 
			
		||||
    logger.error(e);
 | 
			
		||||
    logger.error('Transfer process failed.');
 | 
			
		||||
    process.exit(1);
 | 
			
		||||
  }
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -140,23 +140,12 @@ const formatDiagnostic =
 | 
			
		||||
    );
 | 
			
		||||
    try {
 | 
			
		||||
      if (kind === 'error') {
 | 
			
		||||
        const { message, severity = 'fatal', error, details: moreDetails } = details;
 | 
			
		||||
        const { message, severity = 'fatal' } = details;
 | 
			
		||||
 | 
			
		||||
        const detailsInfo = error ?? moreDetails;
 | 
			
		||||
        let errorMessage = errorColors[severity](`[${severity.toUpperCase()}] ${message}`);
 | 
			
		||||
        if (detailsInfo && detailsInfo.details) {
 | 
			
		||||
          const {
 | 
			
		||||
            origin,
 | 
			
		||||
            details: { step, details: stepDetails, ...moreInfo },
 | 
			
		||||
          } = detailsInfo;
 | 
			
		||||
          errorMessage = `${errorMessage}. Thrown at ${origin} during ${step}.\n`;
 | 
			
		||||
          if (stepDetails || moreInfo) {
 | 
			
		||||
            const { check, ...info } = stepDetails ?? moreInfo;
 | 
			
		||||
            errorMessage = `${errorMessage} Check ${check ?? ''}: ${JSON.stringify(info, null, 2)}`;
 | 
			
		||||
          }
 | 
			
		||||
        }
 | 
			
		||||
        const colorizeError = errorColors[severity];
 | 
			
		||||
        const errorMessage = colorizeError(`[${severity.toUpperCase()}] ${message}`);
 | 
			
		||||
 | 
			
		||||
        logger.error(new Error(errorMessage, error));
 | 
			
		||||
        logger.error(errorMessage);
 | 
			
		||||
      }
 | 
			
		||||
      if (kind === 'info') {
 | 
			
		||||
        const { message, params } = details;
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user