verdnatura-mirror
/
node-ldapjs
mirror of https://github.com/ldapjs/node-ldapjs.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove use of logging methods in conditional tests

This commit is contained in:
Telepsis 2020-11-12 12:38:56 -05:00
parent 41c3c015d9
commit 95b4ebd618
No known key found for this signature in database
GPG Key ID: 5FB8520346B703F6
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/client/client.js
View File

@ -716,12 +716,12 @@ Client.prototype.starttls = function starttls (options,
*/ */
secure.removeAllListeners('error') secure.removeAllListeners('error')
secure.on('data', function onData (data) { secure.on('data', function onData (data) {
if (self.log.trace()) { self.log.trace('data event: %s', util.inspect(data)) } self.log.trace('data event: %s', util.inspect(data))
self._tracker.parser.write(data) self._tracker.parser.write(data)
}) })
secure.on('error', function (err) { secure.on('error', function (err) {
if (self.log.trace()) { self.log.trace({ err: err }, 'error event: %s', new Error().stack) } self.log.trace({ err: err }, 'error event: %s', new Error().stack)
self.emit('error', err) self.emit('error', err)
sock.destroy() sock.destroy()
@ -866,7 +866,7 @@ Client.prototype.connect = function connect () {
} }
socket.on('data', function onData (data) { socket.on('data', function onData (data) {
if (log.trace) { log.trace('data event: %s', util.inspect(data)) } log.trace('data event: %s', util.inspect(data))
tracker.parser.write(data) tracker.parser.write(data)
}) })
@ -955,19 +955,19 @@ Client.prototype.connect = function connect () {
((socket.socket) ? socket.socket : socket).once('close', ((socket.socket) ? socket.socket : socket).once('close',
self._onClose.bind(self)) self._onClose.bind(self))
socket.on('end', function onEnd () { socket.on('end', function onEnd () {
if (log.trace()) { log.trace('end event') } log.trace('end event')
self.emit('end') self.emit('end')
socket.end() socket.end()
}) })
socket.on('error', function onSocketError (err) { socket.on('error', function onSocketError (err) {
if (log.trace()) { log.trace({ err: err }, 'error event: %s', new Error().stack) } log.trace({ err: err }, 'error event: %s', new Error().stack)
self.emit('error', err) self.emit('error', err)
socket.destroy() socket.destroy()
}) })
socket.on('timeout', function onTimeout () { socket.on('timeout', function onTimeout () {
if (log.trace()) { log.trace('timeout event') } log.trace('timeout event')
self.emit('socketTimeout') self.emit('socketTimeout')
socket.end() socket.end()
@ -1069,7 +1069,7 @@ Client.prototype._onClose = function _onClose (closeError) {
((socket.socket) ? socket.socket : socket).removeAllListeners('close') ((socket.socket) ? socket.socket : socket).removeAllListeners('close')
if (this.log.trace()) { this.log.trace('close event had_err=%s', closeError ? 'yes' : 'no') } this.log.trace('close event had_err=%s', closeError ? 'yes' : 'no')
this.emit('close', closeError) this.emit('close', closeError)
// On close we have to walk the outstanding messages and go invoke their // On close we have to walk the outstanding messages and go invoke their
@ -1198,7 +1198,7 @@ Client.prototype._sendSocket = function _sendSocket (message,
function messageCallback (msg) { function messageCallback (msg) {
if (timer) { clearTimeout(timer) } if (timer) { clearTimeout(timer) }
if (log.trace()) { log.trace({ msg: msg ? msg.json : null }, 'response received') } log.trace({ msg: msg ? msg.json : null }, 'response received')
if (expect === 'abandon') { return sendResult('end', null) } if (expect === 'abandon') { return sendResult('end', null) }
@ -1266,7 +1266,7 @@ Client.prototype._sendSocket = function _sendSocket (message,
timer = setTimeout(onRequestTimeout, self.timeout) timer = setTimeout(onRequestTimeout, self.timeout)
} }
if (log.trace()) { log.trace('sending request %j', message.json) } log.trace('sending request %j', message.json)
try { try {
return conn.write(message.toBer(), writeCallback) return conn.write(message.toBer(), writeCallback)

4
lib/messages/message.js
View File

@ -65,7 +65,7 @@ LDAPMessage.prototype.toString = function () {
LDAPMessage.prototype.parse = function (ber) { LDAPMessage.prototype.parse = function (ber) {
assert.ok(ber) assert.ok(ber)
if (this.log.trace()) { this.log.trace('parse: data=%s', util.inspect(ber.buffer)) } this.log.trace('parse: data=%s', util.inspect(ber.buffer))
// Delegate off to the specific type to parse // Delegate off to the specific type to parse
this._parse(ber, ber.length) this._parse(ber, ber.length)
@ -80,7 +80,7 @@ LDAPMessage.prototype.parse = function (ber) {
} }
} }
if (this.log.trace()) { this.log.trace('Parsing done: %j', this.json) } this.log.trace('Parsing done: %j', this.json)
return true return true
} }

2
lib/messages/result.js
View File

@ -47,7 +47,7 @@ LDAPResult.prototype.end = function (status) {
if (typeof (status) === 'number') { this.status = status } if (typeof (status) === 'number') { this.status = status }
const ber = this.toBer() const ber = this.toBer()
if (this.log.debug()) { this.log.debug('%s: sending: %j', this.connection.ldap.id, this.json) } this.log.debug('%s: sending: %j', this.connection.ldap.id, this.json)
try { try {
const self = this const self = this

2
lib/messages/search_response.js
View File

@ -76,7 +76,7 @@ SearchResponse.prototype.send = function (entry, nofiltering) {
} }
try { try {
if (this.log.debug) { this.log.debug('%s: sending: %j', this.connection.ldap.id, entry.json) } this.log.debug('%s: sending: %j', this.connection.ldap.id, entry.json)
this.connection.write(entry.toBer()) this.connection.write(entry.toBer())
this.sentEntries++ this.sentEntries++

4
lib/server.js
View File

@ -329,7 +329,7 @@ function Server (options) {
req.logId = c.ldap.id + '::' + req.messageID req.logId = c.ldap.id + '::' + req.messageID
req.startTime = new Date().getTime() req.startTime = new Date().getTime()
if (log.debug()) { log.debug('%s: message received: req=%j', c.ldap.id, req.json) } log.debug('%s: message received: req=%j', c.ldap.id, req.json)
const res = getResponse(req) const res = getResponse(req)
if (!res) { if (!res) {
@ -429,7 +429,7 @@ function Server (options) {
}) })
c.on('data', function (data) { c.on('data', function (data) {
if (log.trace()) { log.trace('data on %s: %s', c.ldap.id, util.inspect(data)) } log.trace('data on %s: %s', c.ldap.id, util.inspect(data))
c.parser.write(data) c.parser.write(data)
}) })