archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-25 15:07:39 +00:00
Code Issues Projects Releases Wiki Activity

refactor: Refactor direct use of @serverless/utils/log

Browse Source
This commit is contained in:
Piotr Grzesik 2022-01-18 16:24:19 +01:00
parent be446db9ec
commit 05fb97fdab
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/aws/request.js
View File

@ -96,7 +96,8 @@ const shouldS3Accelerate = (method, params) => {
params &&
params.isS3TransferAccelerationEnabled
) {
log('Using S3 Transfer Acceleration Endpoint...');
legacy.log('Using S3 Transfer Acceleration Endpoint...');
log.notice('Using S3 Transfer Acceleration Endpoint...');
return true;
}
return false;

8
lib/configuration/variables/eventually-report-resolution-errors.js
View File

@ -1,7 +1,7 @@
'use strict';
const path = require('path');
const log = require('@serverless/utils/log');
const { log, legacy } = require('@serverless/utils/log');
const ServerlessError = require('../../serverless-error');
const resolveCliInput = require('../../cli/resolve-input');
const logDeprecation = require('../../utils/logDeprecation');
@ -14,11 +14,15 @@ module.exports = (configurationPath, configuration, variablesMeta) => {
if (!resolutionErrors.size) return false;
if (resolveCliInput().isHelpRequest) {
log(
legacy.log(
'Resolution of service configuration failed when resolving variables: ' +
`${Array.from(resolutionErrors, (error) => `\n - ${error.message}`)}\n`,
{ color: 'orange' }
);
log.warning(
'Resolution of service configuration failed when resolving variables: ' +
`${Array.from(resolutionErrors, (error) => `\n - ${error.message}`)}\n`
);
} else {
if (configuration.variablesResolutionMode) {
throw new ServerlessError(

4
lib/plugins/aws/package/compile/functions.js
View File

@ -6,7 +6,6 @@ const crypto = require('crypto');
const fs = require('fs');
const _ = require('lodash');
const path = require('path');
const oldLog = require('@serverless/utils/log');
const ServerlessError = require('../../../../serverless-error');
const deepSortObjectByKey = require('../../../../utils/deepSortObjectByKey');
const getHashForFilePath = require('../lib/getHashForFilePath');
@ -755,8 +754,9 @@ function extractLayerConfigurationsFromFunction(functionProperties, cfTemplate)
const configuration = cfTemplate.Resources[potentialLocalLayerObject.Ref];
if (!configuration) {
log.info(`Could not find reference to layer: ${potentialLocalLayerObject.Ref}.`);
if (process.env.SLS_DEBUG) {
oldLog(`Could not find reference to layer: ${potentialLocalLayerObject.Ref}.`);
legacy.log(`Could not find reference to layer: ${potentialLocalLayerObject.Ref}.`);
}
return;
}

7
lib/utils/npmPackage/isWritable.js
View File

@ -3,7 +3,7 @@
const { format } = require('util');
const path = require('path');
const fsp = require('fs').promises;
const log = require('@serverless/utils/log');
const { log, legacy } = require('@serverless/utils/log');
const npmPackageRoot = path.resolve(__dirname, '../../../');
@ -13,7 +13,10 @@ module.exports = async () => {
await fsp.utimes(npmPackageRoot, String(stats.atimeMs / 1000), String(stats.mtimeMs / 1000));
return true;
} catch (error) {
if (process.env.SLS_DEBUG) log(format('Auto update: file access error: %O', error));
if (process.env.SLS_DEBUG) {
legacy.log(format('Auto update: file access error: %O', error));
}
log.info('Auto update: file access error: %O', error);
return false;
}
};