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

chore: use short handle for process.nextTick

This commit is contained in:
Ruben Bridgewater
2017-05-28 04:32:29 +02:00
parent 0d53d3dcdf
commit b837b46e76
7 changed files with 17 additions and 27 deletions

View File

@@ -67,8 +67,10 @@ function RedisClient (options, stream) {
options.detectBuffers = !!options.detectBuffers
// Override the detectBuffers setting if returnBuffers is active and print a warning
if (options.returnBuffers && options.detectBuffers) {
process.nextTick(() =>
utils.warn(this, 'WARNING: You activated returnBuffers and detectBuffers at the same time. The return value is always going to be a buffer.')
process.nextTick(
utils.warn,
this,
'WARNING: You activated returnBuffers and detectBuffers at the same time. The return value is always going to be a buffer.'
)
options.detectBuffers = false
}

View File

@@ -57,14 +57,14 @@ function readyHandler (client) {
if (!client.closing) {
// TODO: These internal things should be wrapped in a
// special error that describes what is happening
process.nextTick(() => client.emit('error', err))
process.nextTick(client.emit, 'error', err)
}
})
}
if (client.monitoring) { // Monitor has to be fired before pub sub commands
client.internalSendCommand(new Command('monitor', [])).catch((err) => {
if (!client.closing) {
process.nextTick(() => client.emit('error', err))
process.nextTick(client.emit, 'error', err)
}
})
}
@@ -86,7 +86,7 @@ function readyHandler (client) {
const args = client.subscriptionSet[key]
client[command]([args]).catch((err) => {
if (!client.closing) {
process.nextTick(() => client.emit('error', err))
process.nextTick(client.emit, 'error', err)
}
})
}

View File

@@ -103,9 +103,7 @@ function replyInOrder (client, callback, err, res, queue) {
commandObj = client.offlineQueue.peekBack() || client.commandQueue.peekBack()
}
if (!commandObj) {
process.nextTick(() => {
callback(err, res)
})
process.nextTick(callback, err, res)
} else {
const tmp = commandObj.callback
commandObj.callback = function (e, r) {

View File

@@ -127,9 +127,7 @@ describe('connection tests', () => {
client.once('ready', () => {
client.set('foo', 'bar').catch(helper.isError())
client.quit().then(() => done())
process.nextTick(() => {
client._stream.destroy()
})
process.nextTick(() => client._stream.destroy())
})
})
})
@@ -288,9 +286,7 @@ describe('connection tests', () => {
client = redis.createClient({
connectTimeout: 1000
})
process.nextTick(() => {
assert.strictEqual(client._stream._idleTimeout, 1000)
})
process.nextTick(assert.strictEqual, client._stream._idleTimeout, 1000)
client.on('connect', () => {
assert.strictEqual(client._stream._idleTimeout, -1)
assert.strictEqual(client._stream.listeners('timeout').length, 0)

View File

@@ -207,6 +207,6 @@ module.exports = {
family: 4
}
client.address = '127.0.0.1:65535'
client._stream.destroy()
process.nextTick(() => client._stream.destroy())
}
}

View File

@@ -10,11 +10,7 @@ client.set('foo').catch((err) => {
assert(/good-traces.js:9:8/.test(err.stack))
client.set('foo', 'bar').catch((err) => {
assert(/good-traces.js:11:10/.test(err.stack))
client.quit(() => {
process.exit(0)
})
})
process.nextTick(() => {
client._stream.destroy()
client.quit(() => process.exit(0))
})
process.nextTick(() => client._stream.destroy())
})

View File

@@ -476,12 +476,10 @@ describe('The nodeRedis client', () => {
assert(err instanceof redis.InterruptError)
error = err.origin
})
// Make sure we call execute out of the reply
// ready is called in a reply
process.nextTick(() => {
// Make sure we call execute out of the reply.
// Ready is called in a reply.
// Fail the set answer. Has no corresponding command obj and will therefore land in the error handler and set
client._replyParser.execute(Buffer.from('a*1\r*1\r$1`zasd\r\na'))
})
process.nextTick(() => client._replyParser.execute(Buffer.from('a*1\r*1\r$1`zasd\r\na')))
})
})
})