thunderstrike/puppeteer
thunderstrike/puppeteer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Respect the loglevel for logging (#4014)

Browse Source 
This adds support for disabling console.log on CI and when
the loglevel asks for it.
This commit is contained in:
Stephan Rodemeier 2019-03-19 19:27:42 +01:00 committed by Andrey Lushnikov
parent 28bab53bf6
commit 11afadc680
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
install.js
View File

@ -21,15 +21,15 @@ if (require('./package.json').name === 'puppeteer-core')
buildNode6IfNecessary(); buildNode6IfNecessary();
if (process.env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD) { if (process.env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD) {
console.log('**INFO** Skipping Chromium download. "PUPPETEER_SKIP_CHROMIUM_DOWNLOAD" environment variable was found.'); logPolitely('**INFO** Skipping Chromium download. "PUPPETEER_SKIP_CHROMIUM_DOWNLOAD" environment variable was found.');
return; return;
} }
if (process.env.NPM_CONFIG_PUPPETEER_SKIP_CHROMIUM_DOWNLOAD || process.env.npm_config_puppeteer_skip_chromium_download) { if (process.env.NPM_CONFIG_PUPPETEER_SKIP_CHROMIUM_DOWNLOAD || process.env.npm_config_puppeteer_skip_chromium_download) {
console.log('**INFO** Skipping Chromium download. "PUPPETEER_SKIP_CHROMIUM_DOWNLOAD" was set in npm config.'); logPolitely('**INFO** Skipping Chromium download. "PUPPETEER_SKIP_CHROMIUM_DOWNLOAD" was set in npm config.');
return; return;
} }
if (process.env.NPM_PACKAGE_CONFIG_PUPPETEER_SKIP_CHROMIUM_DOWNLOAD || process.env.npm_package_config_puppeteer_skip_chromium_download) { if (process.env.NPM_PACKAGE_CONFIG_PUPPETEER_SKIP_CHROMIUM_DOWNLOAD || process.env.npm_package_config_puppeteer_skip_chromium_download) {
console.log('**INFO** Skipping Chromium download. "PUPPETEER_SKIP_CHROMIUM_DOWNLOAD" was set in project config.'); logPolitely('**INFO** Skipping Chromium download. "PUPPETEER_SKIP_CHROMIUM_DOWNLOAD" was set in project config.');
return; return;
} }
@ -71,7 +71,7 @@ browserFetcher.download(revisionInfo.revision, onProgress)
* @return {!Promise} * @return {!Promise}
*/ */
function onSuccess(localRevisions) { function onSuccess(localRevisions) {
console.log('Chromium downloaded to ' + revisionInfo.folderPath); logPolitely('Chromium downloaded to ' + revisionInfo.folderPath);
localRevisions = localRevisions.filter(revision => revision !== revisionInfo.revision); localRevisions = localRevisions.filter(revision => revision !== revisionInfo.revision);
// Remove previous chromium revisions. // Remove previous chromium revisions.
const cleanupOldVersions = localRevisions.map(revision => browserFetcher.remove(revision)); const cleanupOldVersions = localRevisions.map(revision => browserFetcher.remove(revision));
@ -121,7 +121,7 @@ function buildNode6IfNecessary() {
if (supportsAsyncAwait()) if (supportsAsyncAwait())
return; return;
// Re-build node6/ folder. // Re-build node6/ folder.
console.log('Building Puppeteer for Node 6'); logPolitely('Building Puppeteer for Node 6');
require(path.join(__dirname, 'utils', 'node6-transform')); require(path.join(__dirname, 'utils', 'node6-transform'));
} }
@ -145,3 +145,12 @@ function generateProtocolTypesIfNecessary(updated) {
return; return;
return require('./utils/protocol-types-generator'); return require('./utils/protocol-types-generator');
} }
function logPolitely(toBeLogged) {
const logLevel = process.env.npm_config_loglevel;
const logLevelDisplay = ['silent', 'error', 'warn'].indexOf(logLevel) > -1;
if (!logLevelDisplay)
console.log(toBeLogged);
}