-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
feat(singleton): support async create function #2382
Merged
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
6ee22b0
feat(singleton): support async create function
dead-horse 0bddc77
f
dead-horse 8be0fd2
f
dead-horse bda213f
f
dead-horse 447c3c5
Merge branch 'master' into async-singleton
popomore 02e30aa
Merge branch 'master' into async-singleton
popomore File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -384,15 +384,16 @@ class EggApplication extends EggCore { | |
/** | ||
* create a singleton instance | ||
* @param {String} name - unique name for singleton | ||
* @param {Object} create - method will be invoked when singleton instance create | ||
* @param {Function|AsyncFunction} create - method will be invoked when singleton instance create | ||
*/ | ||
addSingleton(name, create) { | ||
const options = {}; | ||
options.name = name; | ||
options.create = create; | ||
options.app = this; | ||
const singleton = new Singleton(options); | ||
singleton.init(); | ||
const done = this.readyCallback(`singleton:${name}`); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. use beforeStart? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 改了 |
||
singleton.init().then(done); | ||
} | ||
|
||
_patchClusterClient(client) { | ||
|
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
'use strict'; | ||
|
||
const createDataService = require('./create'); | ||
const createDataService = require('./create').sync; | ||
const createDataServiceAsync = require('./create').async; | ||
|
||
module.exports = agent => { | ||
agent.addSingleton('dataService', createDataService); | ||
agent.addSingleton('dataServiceAsync', createDataServiceAsync); | ||
}; |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
'use strict'; | ||
|
||
const createDataService = require('./create'); | ||
const createDataService = require('./create').sync; | ||
const createDataServiceAsync = require('./create').async; | ||
|
||
module.exports = app => { | ||
app.addSingleton('dataService', createDataService); | ||
app.addSingleton('dataServiceAsync', createDataServiceAsync); | ||
}; |
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
有一个可以讨论的地方,其实可以判断 this.create 来决定 createInstance 方法是返回创建后的实例还是返回一个 promise,这样就不需要 createInstanceAsync 方法了,但是 createInstance 方法就不统一了,也不好。所以我倾向于新增一个 createInstanceAsync 方法来应对这种特殊场景。
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
主要还是兼容问题,如果没有问题我倾向于 createInstance 就是一个 async function
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
就是因为有兼容问题才这样的,createInstance 不能直接返回一个 async function