redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-06 02:15:48 +03:00
Code Activity

Test for statements instead of matching them if test is enough

Browse Source 
precompile regex
This commit is contained in:
Ruben Bridgewater
2015-09-02 00:44:17 +02:00
parent 19db6d1dad
commit 62041c519f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
index.js
View File

@@ -199,6 +199,9 @@ RedisClient.prototype.on_error = function (msg) {
this.connection_gone("error"); this.connection_gone("error");
}; };
var noPasswordIsSet = /no password is set/;
var loading = /LOADING/;
RedisClient.prototype.do_auth = function () { RedisClient.prototype.do_auth = function () {
var self = this; var self = this;
@@ -207,14 +210,14 @@ RedisClient.prototype.do_auth = function () {
self.send_anyway = true; self.send_anyway = true;
self.send_command("auth", [this.auth_pass], function (err, res) { self.send_command("auth", [this.auth_pass], function (err, res) {
if (err) { if (err) {
if (err.toString().match("LOADING")) { if (loading.test(err.message)) {
// if redis is still loading the db, it will not authenticate and everything else will fail // if redis is still loading the db, it will not authenticate and everything else will fail
console.log("Redis still loading, trying to authenticate later"); console.log("Redis still loading, trying to authenticate later");
setTimeout(function () { setTimeout(function () {
self.do_auth(); self.do_auth();
}, 2000); // TODO - magic number alert }, 2000); // TODO - magic number alert
return; return;
} else if (err.toString().match("no password is set")) { } else if (noPasswordIsSet.test(err.message)) {
console.log("Warning: Redis server does not require a password, but a password was supplied."); console.log("Warning: Redis server does not require a password, but a password was supplied.");
err = null; err = null;
res = "OK"; res = "OK";