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

Keep monitoring mode if once activated and use internal function for select and monitor while connecting

Browse Source
This commit is contained in:
Ruben Bridgewater
2016-05-31 15:11:18 +02:00
parent b3e89fee31
commit c1f7755142
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
index.js
View File

@@ -4,6 +4,7 @@ var net = require('net');
var tls = require('tls'); var tls = require('tls');
var util = require('util'); var util = require('util');
var utils = require('./lib/utils'); var utils = require('./lib/utils');
var Command = require('./lib/command');
var Queue = require('double-ended-queue'); var Queue = require('double-ended-queue');
var errorClasses = require('./lib/customErrors'); var errorClasses = require('./lib/customErrors');
var EventEmitter = require('events'); var EventEmitter = require('events');
@@ -154,7 +155,6 @@ function RedisClient (options, stream) {
this.times_connected = 0; this.times_connected = 0;
this.buffers = options.return_buffers || options.detect_buffers; this.buffers = options.return_buffers || options.detect_buffers;
this.options = options; this.options = options;
this.old_state = {};
this.reply = 'ON'; // Returning replies is the default this.reply = 'ON'; // Returning replies is the default
// Init parser // Init parser
this.reply_parser = create_parser(this); this.reply_parser = create_parser(this);
@@ -445,10 +445,10 @@ RedisClient.prototype.on_ready = function () {
// Restore modal commands from previous connection. The order of the commands is important // Restore modal commands from previous connection. The order of the commands is important
if (this.selected_db !== undefined) { if (this.selected_db !== undefined) {
this.select(this.selected_db); this.internal_send_command(new Command('select', [this.selected_db]));
} }
if (this.old_state.monitoring) { // Monitor has to be fired before pub sub commands if (this.monitoring) { // Monitor has to be fired before pub sub commands
this.monitor(); this.internal_send_command(new Command('monitor', []));
} }
var callback_count = Object.keys(this.subscription_set).length; var callback_count = Object.keys(this.subscription_set).length;
if (!this.options.disable_resubscribing && callback_count) { if (!this.options.disable_resubscribing && callback_count) {
@@ -571,12 +571,6 @@ RedisClient.prototype.connection_gone = function (why, error) {
this.cork = noop; this.cork = noop;
this.uncork = noop; this.uncork = noop;
this.pipeline = false; this.pipeline = false;
var state = {
monitoring: this.monitoring
};
this.old_state = state;
this.monitoring = false;
this.pub_sub_mode = 0; this.pub_sub_mode = 0;
// since we are collapsing end and close, users don't expect to be called twice // since we are collapsing end and close, users don't expect to be called twice
@@ -874,16 +868,16 @@ RedisClient.prototype.internal_send_command = function (command_obj) {
var big_data = false; var big_data = false;
var args_copy = new Array(len); var args_copy = new Array(len);
if (process.domain && command_obj.callback) {
command_obj.callback = process.domain.bind(command_obj.callback);
}
if (this.ready === false || this.stream.writable === false) { if (this.ready === false || this.stream.writable === false) {
// Handle offline commands right away // Handle offline commands right away
handle_offline_command(this, command_obj); handle_offline_command(this, command_obj);
return false; // Indicate buffering return false; // Indicate buffering
} }
if (process.domain && command_obj.callback) {
command_obj.callback = process.domain.bind(command_obj.callback);
}
for (i = 0; i < len; i += 1) { for (i = 0; i < len; i += 1) {
if (typeof args[i] === 'string') { if (typeof args[i] === 'string') {
// 30000 seemed to be a good value to switch to buffers after testing and checking the pros and cons // 30000 seemed to be a good value to switch to buffers after testing and checking the pros and cons