Skip to content

Commit

Permalink
Add mention of tls option
Browse files Browse the repository at this point in the history
  • Loading branch information
paddybyers authored and Ruben Bridgewater committed Nov 23, 2015
1 parent 1fa9f15 commit c74107c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@ limits total amount of connection tries. Setting this to 1 will prevent any reco
* `family`: *IPv4*; You can force using IPv6 if you set the family to 'IPv6'. See Node.js [net](https://nodejs.org/api/net.html) or [dns](https://nodejs.org/api/dns.html) modules how to use the family type.
* `disable_resubscribing`: *false*; If set to `true`, a client won't resubscribe after disconnecting
* `rename_commands`: *null*; pass a object with renamed commands to use those instead of the original functions. See the [redis security topics](http://redis.io/topics/security) for more info.
* `tls`: an object containing options to pass to [tls.connect](http://nodejs.org/api/tls.html#tls_tls_connect_port_host_options_callback),
to set up a TLS connection to Redis (if, for example, it is set up to be accessible via a tunnel).

```js
var redis = require("redis"),
Expand Down
3 changes: 1 addition & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,12 @@ function RedisClient (options) {
// Copy the options so they are not mutated
options = clone(options);
events.EventEmitter.call(this);
var self = this;
var cnx_options = {};
if (options.path) {
cnx_options.path = options.path;
this.address = options.path;
} else {
cnx_options.port = options.port || default_port;
cnx_options.port = +options.port || default_port;
cnx_options.host = options.host || default_host;
cnx_options.family = (!options.family && net.isIP(cnx_options.host)) || (options.family === 'IPv6' ? 6 : 4);
this.address = cnx_options.host + ':' + cnx_options.port;
Expand Down
6 changes: 3 additions & 3 deletions test/lib/stunnel-process.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ StunnelProcess.prototype.clear = function() {
};

StunnelProcess.prototype.stop = function(done) {
if(this.stunnel) {
this.stunnel.kill();
}
if (this.stunnel) {
this.stunnel.kill();
}
};

module.exports = {
Expand Down

0 comments on commit c74107c

Please sign in to comment.