Skip to content

fix(*): don't crash if cpu-core-count is not available #12332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 5, 2019
Merged

fix(*): don't crash if cpu-core-count is not available #12332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
810bd98
fix: don't crash if cpu-core-count is not available
pieh Mar 5, 2019
22d7212
Merge remote-tracking branch 'origin/master' into cpu-count-fallback
pieh Mar 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions packages/gatsby-plugin-manifest/src/gatsby-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,16 @@ const { defaultIcons, doesIconExist } = require(`./common.js`)

sharp.simd(true)

// Handle Sharp's concurrency based on the Gatsby CPU count
// See: http://sharp.pixelplumbing.com/en/stable/api-utility/#concurrency
// See: https://www.gatsbyjs.org/docs/multi-core-builds/
const cpuCoreCount = require(`gatsby/dist/utils/cpu-core-count`)
sharp.concurrency(cpuCoreCount())
try {
// Handle Sharp's concurrency based on the Gatsby CPU count
// See: http://sharp.pixelplumbing.com/en/stable/api-utility/#concurrency
// See: https://www.gatsbyjs.org/docs/multi-core-builds/
const cpuCoreCount = require(`gatsby/dist/utils/cpu-core-count`)
sharp.concurrency(cpuCoreCount())
} catch {
// if above throws error this probably means that used Gatsby version
// doesn't support cpu-core-count utility.
}

function generateIcons(icons, srcIcon) {
return Promise.map(icons, icon => {
Expand Down
15 changes: 10 additions & 5 deletions packages/gatsby-plugin-sharp/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,16 @@ Promise.promisifyAll(sharp.prototype, { multiArgs: true })
// adventurous and see what happens with it on.
sharp.simd(true)

// Handle Sharp's concurrency based on the Gatsby CPU count
// See: http://sharp.pixelplumbing.com/en/stable/api-utility/#concurrency
// See: https://www.gatsbyjs.org/docs/multi-core-builds/
const cpuCoreCount = require(`gatsby/dist/utils/cpu-core-count`)
sharp.concurrency(cpuCoreCount())
try {
// Handle Sharp's concurrency based on the Gatsby CPU count
// See: http://sharp.pixelplumbing.com/en/stable/api-utility/#concurrency
// See: https://www.gatsbyjs.org/docs/multi-core-builds/
const cpuCoreCount = require(`gatsby/dist/utils/cpu-core-count`)
sharp.concurrency(cpuCoreCount())
} catch {
// if above throws error this probably means that used Gatsby version
// doesn't support cpu-core-count utility.
}

const bar = new ProgressBar(
`Generating image thumbnails [:bar] :current/:total :elapsed secs :percent`,
Expand Down