⏰ Call getImageSizeFromUrl with timeout
#8044
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aileen
changed the title
getImageSize with timeoutgetImageSizeFromUrl with timeout
kirrg001
reviewed
Mar 1, 2017
| @@ -71,28 +74,27 @@ module.exports.getImageSizeFromUrl = function getImageSizeFromUrl(imagePath, tim | |||
|
|
|||
| return resolve(imageObject); | |||
| } catch (err) { | |||
| // @ToDo: add real error handling here as soon as we have error logging | |||
| err.imagePath = imagePath; | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
refs TryGhost#8041 Calls `getImageSize` with an timeout of 6sec. and adds a default timeout (in case, function is called without optional timeout) of 10sec, to prevent node from using its default timeout of 2minutes 😱
aileen
force-pushed
the
imagesize-timeout
branch
from
ad60de3
to
ec78842
Compare
kirrg001
reviewed
Mar 1, 2017
| @@ -18,13 +19,12 @@ function getCachedImageSizeFromUrl(url) { | |||
|
|
|||
| // image size is not in cache | |||
| if (!imageSizeCache[url]) { | |||
| return getImageSizeFromUrl(url).then(function (res) { | |||
| return getImageSizeFromUrl(url, 6000).then(function (res) { | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
kirrg001
pushed a commit
to kirrg001/Ghost
that referenced
this pull request
Mar 20, 2017
refs TryGhost#8041 Calls `getImageSize` with an timeout of 6sec. and adds a default timeout (in case, function is called without optional timeout) of 10sec, to prevent node from using its default timeout of 2minutes 😱
ErisDS
pushed a commit
that referenced
this pull request
Mar 20, 2017
refs #8041 Calls `getImageSize` with an timeout of 6sec. and adds a default timeout (in case, function is called without optional timeout) of 10sec, to prevent node from using its default timeout of 2minutes 😱
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
refs #8041
Calls
getImageSizewith an timeout of 6sec. and adds a default timeout (in case, function is called without optional timeout) of 10sec, to prevent node from using its default timeout of 2minutes 😱