diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..7d9664d --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,22 @@ +Copyright (c) 2012 Redsmin - Francois-Guillaume Ribreau + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/lib/Endpoint.js b/lib/Endpoint.js index 82fa346..e895aea 100644 --- a/lib/Endpoint.js +++ b/lib/Endpoint.js @@ -76,8 +76,8 @@ _.extend(Endpoint.prototype, require('events').EventEmitter.prototype, { this.socket.on('error', this.onError); this.socket.setTimeout(0); - this.socket.setKeepAlive(true, 30); - this.socket.setNoDelay(true); + this.socket.setNoDelay(); + this.socket.setKeepAlive(true); }, reconnect:function(number, delay){ diff --git a/lib/RedisClient.js b/lib/RedisClient.js index fe0e75f..bb722da 100644 --- a/lib/RedisClient.js +++ b/lib/RedisClient.js @@ -63,7 +63,7 @@ _.extend(RedisClient.prototype, require('events').EventEmitter.prototype, { * Enable/disable keep-alive functionality, and optionally set the initial delay * before the first keepalive probe is sent on an idle socket. enable defaults to false. */ - this.socket.setKeepAlive(true, 30); + this.socket.setKeepAlive(true); /** * Disables the Nagle algorithm. By default TCP connections use the Nagle algorithm, diff --git a/package.json b/package.json index b180589..a0aaf82 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,10 @@ { "name": "redsmin", - "description": "Redsmin daemon for the Redsmin service", - "version": "0.3.0", + "description": "Redsmin proxy daemon for the Redsmin service", + "version": "0.3.1", "keywords": [ "redis", + "gui", "redsmin", "proxy" ], @@ -23,6 +24,12 @@ "bin": { "redsmin": "./bin/redsmin" }, + "licenses": [ + { + "type": "MIT", + "url": "https://github.com/Redsmin/redsmin/blob/master/LICENSE" + } + ], "dependencies": { "lodash": "~0.3.2", "winston": "~0.6.1",