yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-04 03:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate errors being logged

Browse Source
This commit is contained in:
Convly 2023-01-25 10:31:01 +01:00
parent 1a4b57b366
commit eb6e6db843
5 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/data-transfer/package.json
View File

@ -65,7 +65,7 @@
"@types/uuid": "9.0.0", "@types/uuid": "9.0.0",
"koa": "2.13.4", "koa": "2.13.4",
"@types/koa": "2.13.4", "@types/koa": "2.13.4",
"knex": "1.0.7", "knex": "2.4.0",
"rimraf": "3.0.2", "rimraf": "3.0.2",
"typescript": "4.6.2" "typescript": "4.6.2"
}, },

2
packages/core/strapi/lib/commands/transfer/export.js
View File

@ -112,7 +112,7 @@ module.exports = async (opts) => {
logger.log(`Export archive is in ${chalk.green(outFile)}`); logger.log(`Export archive is in ${chalk.green(outFile)}`);
} catch { } catch {
await strapi.telemetry.send('didDEITSProcessFail', getTelemetryPayload()); await strapi.telemetry.send('didDEITSProcessFail', getTelemetryPayload());
logger.error('Export process failed'); logger.error('Export process failed.');
process.exit(1); process.exit(1);
} }

3
packages/core/strapi/lib/commands/transfer/import.js
View File

@ -112,8 +112,7 @@ module.exports = async (opts) => {
logger.info('Import process has been completed successfully!'); logger.info('Import process has been completed successfully!');
} catch (e) { } catch (e) {
await strapiInstance.telemetry.send('didDEITSProcessFail', getTelemetryPayload()); await strapiInstance.telemetry.send('didDEITSProcessFail', getTelemetryPayload());
logger.error('Import process failed unexpectedly'); logger.error('Import process failed.');
logger.error(e);
process.exit(1); process.exit(1);
} }

3
packages/core/strapi/lib/commands/transfer/transfer.js
View File

@ -123,8 +123,7 @@ module.exports = async (opts) => {
logger.log(`${chalk.bold('Transfer process has been completed successfully!')}`); logger.log(`${chalk.bold('Transfer process has been completed successfully!')}`);
process.exit(0); process.exit(0);
} catch (e) { } catch (e) {
logger.error('Transfer process failed unexpectedly'); logger.error('Transfer process failed.');
logger.error(e);
process.exit(1); process.exit(1);
} }
}; };

19
packages/core/strapi/lib/commands/transfer/utils.js
View File

@ -140,23 +140,12 @@ const formatDiagnostic =
); );
try { try {
if (kind === 'error') { if (kind === 'error') {
const { message, severity = 'fatal', error, details: moreDetails } = details; const { message, severity = 'fatal' } = details;
const detailsInfo = error ?? moreDetails; const colorizeError = errorColors[severity];
let errorMessage = errorColors[severity](`[${severity.toUpperCase()}] ${message}`); const errorMessage = colorizeError(`[${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)}`;
}
}
logger.error(new Error(errorMessage, error)); logger.error(errorMessage);
} }
if (kind === 'info') { if (kind === 'info') {
const { message, params } = details; const { message, params } = details;