Skip to content

Commit

Permalink
fix: better logging from inside transform loops
Browse files Browse the repository at this point in the history
  • Loading branch information
espy authored and janl committed Sep 12, 2018
1 parent 197398b commit 9f7735b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions jobs/create-group-version-branch.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,13 @@ module.exports = async function (

const oldPkgVersion = _.get(repoDoc, `packages['${pkg.filename}'].${pkg.type}.${depName}`)
if (!oldPkgVersion) {
log.warn('exited transform creation: could not find old package version', {newVersion: version})
log.warn(`exited transform creation: could not find old package version for ${depName}`, {newVersion: version, dependencyType: pkg.type, packageFile: _.get(repoDoc, `packages['${pkg.filename}']`)})
return
}
const satisfies = semver.satisfies(latestDependencyVersion, oldPkgVersion)
// no downgrades
if (semver.ltr(latestDependencyVersion, oldPkgVersion)) {
log.warn(`exited transform creation: ${dependency} ${latestDependencyVersion} would be a downgrade from ${oldPkgVersion}`, {newVersion: latestDependencyVersion, oldVersion: oldPkgVersion})
log.warn(`exited transform creation: ${depName} ${latestDependencyVersion} would be a downgrade from ${oldPkgVersion}`, {newVersion: latestDependencyVersion, oldVersion: oldPkgVersion})
return
}

Expand All @@ -199,12 +199,12 @@ module.exports = async function (
})
const oldVersionResolved = getOldVersionResolved(satisfyingVersions, npmDoc.distTags, 'latest')
if (!oldVersionResolved) {
log.warn('exited transform creation: could not resolve old version (no update?)', {newVersion: version, satisfyingVersions, latestDependencyVersion, oldPkgVersion})
log.warn(`exited transform creation: could not resolve old version for ${depName} (no update?)`, {newVersion: version, satisfyingVersions, latestDependencyVersion, oldPkgVersion})
return null
}

if (semver.prerelease(latestDependencyVersion) && !semver.prerelease(oldVersionResolved)) {
log.info(`exited transform creation: ${dependency} ${latestDependencyVersion} is a prerelease on latest and user does not use prereleases for this dependency`, {latestDependencyVersion, oldPkgVersion})
log.info(`exited transform creation: ${depName} ${latestDependencyVersion} is a prerelease on latest and user does not use prereleases for this dependency`, {latestDependencyVersion, oldPkgVersion})
return null
}

Expand Down
8 changes: 4 additions & 4 deletions jobs/create-version-branch.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ module.exports = async function (

const oldPkgVersion = _.get(json, [dependencyType, depName])
if (!oldPkgVersion) {
log.warn('exited transform creation: could not find old package version', {newVersion: version, json})
log.warn(`exited transform creation: could not find old package version for ${depName}`, {newVersion: version, dependencyType, packageFile: _.get(json, [dependencyType])})
return null
}

Expand All @@ -137,7 +137,7 @@ module.exports = async function (
const repoURL = _.get(npmDoc, `versions['${latestDependencyVersion}'].repository.url`)

if (semver.ltr(latestDependencyVersion, oldPkgVersion)) { // no downgrades
log.warn(`exited transform creation: ${dependency} ${latestDependencyVersion} would be a downgrade from ${oldPkgVersion}`, {newVersion: latestDependencyVersion, oldVersion: oldPkgVersion})
log.warn(`exited transform creation: ${depName} ${latestDependencyVersion} would be a downgrade from ${oldPkgVersion}`, {newVersion: latestDependencyVersion, oldVersion: oldPkgVersion})
return null
}
const satisfies = semver.satisfies(latestDependencyVersion, oldPkgVersion)
Expand All @@ -161,12 +161,12 @@ module.exports = async function (
})
const oldVersionResolved = getOldVersionResolved(satisfyingVersions, npmDoc.distTags, 'latest')
if (!oldVersionResolved) {
log.warn('exited transform creation: could not resolve old version (no update?)', {newVersion: version, json, satisfyingVersions, latestDependencyVersion, oldPkgVersion})
log.warn(`exited transform creation: could not resolve old version for ${depName} (no update?)`, {newVersion: version, json, satisfyingVersions, latestDependencyVersion, oldPkgVersion})
return null
}

if (semver.prerelease(latestDependencyVersion) && !semver.prerelease(oldVersionResolved)) {
log.info(`exited transform creation: ${dependency} ${latestDependencyVersion} is a prerelease on latest and user does not use prereleases for this dependency`, {latestDependencyVersion, oldPkgVersion})
log.info(`exited transform creation: ${depName} ${latestDependencyVersion} is a prerelease on latest and user does not use prereleases for this dependency`, {latestDependencyVersion, oldPkgVersion})
return null
}

Expand Down

0 comments on commit 9f7735b

Please sign in to comment.