Skip to content

Added subevent option #26

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
sgress454 merged 3 commits into from
Jun 27, 2016
Merged

Added subevent option #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3173aec
Fixed the socket adapter config when using ioredis
jeremy-albuixech May 19, 2016
c9e75ce
User can choose between clients node-redis and ioredis
jeremy-albuixech May 19, 2016
2c8f87f
Added the subEvent option
jeremy-albuixech May 19, 2016
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
3 changes: 3 additions & 0 deletions lib/configure.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ module.exports = function ToConfigure(app) {
if (app.config.sockets.subClient) {
app.config.sockets.adapterOptions.subClient = app.config.sockets.subClient;
}
if (app.config.sockets.subEvent) {
Copy link
Copy Markdown
Member

@mikermcneil mikermcneil Nov 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we need docs on this one here

cc @sgress454

Copy link
Copy Markdown
Member

@mikermcneil mikermcneil Nov 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Albi34 would you take a minute to add that to the advanced options table here on the 1.0 branch of sails-docs?

needs type, the default value, and a description, e.g.

Optional. The name of the Redis client event that Socket.io will subscribe to.
(based on https://github.com/socketio/socket.io-redis#adapteropts)

Thanks!

app.config.sockets.adapterOptions.subEvent = app.config.sockets.subEvent;
}
if (app.config.sockets.socket) {
app.config.sockets.adapterOptions.socket = app.config.sockets.socket;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/prepare-driver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ module.exports = function (app){
// If `pass` was supplied, pass it in as `auth_pass`
if (adapterConfig.pass) {

redisClientOpts.auth_pass = adapterConfig.pass;
redisClientOpts.auth_pass = adapterConfig.pass;
}


Expand Down