fix: make sure config.httpclient.timeout >= 30000 #1165
Merged
Conversation
This file contains hidden or 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
Codecov Report
@@ Coverage Diff @@
## master #1165 +/- ##
==========================================
+ Coverage 99.7% 99.71% +0.01%
==========================================
Files 29 29
Lines 679 705 +26
==========================================
+ Hits 677 703 +26
Misses 2 2
Continue to review full report at Codecov.
|
Member
|
为什么 3 秒？ |
Member
Author
|
防止应用设置成小于 30s 的 |
Member
|
这个是单次请求的超时时间还是? |
dead-horse
reviewed
Jul 11, 2017
lib/core/httpclient.js
Outdated
| require('./dnscache_httpclient') : urllib.HttpClient; | ||
|
|
||
| const config = app.config.httpclient; | ||
| if (typeof config.timeout === 'number' && config.timeout < 30000) { |
Member
There was a problem hiding this comment.
config.timeout 支持写成 3s 形式的么？
Member
Author
|
@popomore 我改一下，将 httpclient 的配置改成如下 httpclient: {
// urllib 的全局 options，优先级低于每次请求的 options
request: { timeout, ... }
// http agent options
httpAgent: { ... },
// https agent options
httpsAgent: { ... },
}为了保持兼容性，原来的配置写法统一支持，再下一个 major 版本再 depd。 |
popomore
reviewed
Jul 14, 2017
lib/core/httpclient.js
Outdated
|
|
||
| const config = app.config.httpclient; | ||
| if (typeof config.timeout === 'number' && config.timeout < 30000) { | ||
| app.coreLogger.warn('[egg:httpclient] config.httpclient.timeout(%s) can\'t below 30000, auto reset to 30000', |
Contributor
|
可以合了吗？ |
Member
Author
|
@gxcsoccer 还不行，我得改完 |
Member
Author
fengmk2
force-pushed
the
fix-httpclient-timeout
branch
from
3ed3610 to
e0e0b9e
Compare
Member
Author
|
@gxcsoccer @popomore 可以 review 了，都兼容了，然后区分了。 |
distinguish options: request, httpAgent and httpsAgent on httpclient
fengmk2
force-pushed
the
fix-httpclient-timeout
branch
from
277263c to
9227290
Compare
popomore
approved these changes
Jul 18, 2017
Member
Author
|
我提个 release |
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.
Checklist
npm testpassesAffected core subsystem(s)
Description of change