chore(logging): downgrade redis.watch.conflict to warning level (#2307) r=@vladikoff
This commit is contained in:
Родитель
695499ab11
Коммит
d219cdd823
|
@ -68,7 +68,9 @@ module.exports = (log, client) => {
|
||||||
.then(result => {
|
.then(result => {
|
||||||
isUpdating = false
|
isUpdating = false
|
||||||
if (! result) {
|
if (! result) {
|
||||||
log.error({ op: 'redis.watch.conflict', key })
|
// Really this isn't an error as such, it just indicates that
|
||||||
|
// this function is operating sanely in concurrent conditions.
|
||||||
|
log.warn({ op: 'redis.watch.conflict', key })
|
||||||
throw error.unexpectedError()
|
throw error.unexpectedError()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
@ -490,10 +490,11 @@ describe('redis/connection:', () => {
|
||||||
assert.equal(redisMulti.execAsync.callCount, 1)
|
assert.equal(redisMulti.execAsync.callCount, 1)
|
||||||
})
|
})
|
||||||
|
|
||||||
it('called log.error correctly', () => {
|
it('called log.warn correctly', () => {
|
||||||
assert.equal(log.error.callCount, 1)
|
assert.equal(log.error.callCount, 0)
|
||||||
assert.equal(log.error.args[0].length, 1)
|
assert.equal(log.warn.callCount, 1)
|
||||||
assert.deepEqual(log.error.args[0][0], {
|
assert.equal(log.warn.args[0].length, 1)
|
||||||
|
assert.deepEqual(log.warn.args[0][0], {
|
||||||
op: 'redis.watch.conflict',
|
op: 'redis.watch.conflict',
|
||||||
key: 'wibble'
|
key: 'wibble'
|
||||||
})
|
})
|
||||||
|
|
|
@ -10,7 +10,7 @@ const assert = require('insist')
|
||||||
const config = require(`${ROOT_DIR}/config`).getProperties()
|
const config = require(`${ROOT_DIR}/config`).getProperties()
|
||||||
const P = require(`${ROOT_DIR}/lib/promise`)
|
const P = require(`${ROOT_DIR}/lib/promise`)
|
||||||
|
|
||||||
const log = { info () {}, error () {} }
|
const log = { info () {}, warn () {}, error () {} }
|
||||||
|
|
||||||
const redis = require(`${ROOT_DIR}/lib/redis`)(Object.assign({}, config.redis, { enabled: true }), log)
|
const redis = require(`${ROOT_DIR}/lib/redis`)(Object.assign({}, config.redis, { enabled: true }), log)
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче