Skip to content

Commit

Permalink
Only generate the debug text for payload debug logging if payload deb…
Browse files Browse the repository at this point in the history
…ug logging is enabled.
  • Loading branch information
pekim committed Jan 8, 2012
1 parent 9873a10 commit 5b77e6b
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 7 deletions.
16 changes: 12 additions & 4 deletions lib/connection.coffee
Expand Up @@ -235,7 +235,9 @@ class Connection extends EventEmitter
sendPreLogin: ->
payload = new PreloginPayload()
@messageIo.sendMessage(TYPE.PRELOGIN, payload.data)
@debug.payload(payload.toString(' '))
@debug.payload(->
payload.toString(' ')
)

emptyMessageBuffer: ->
@messageBuffer = new Buffer(0)
Expand All @@ -245,7 +247,9 @@ class Connection extends EventEmitter

processPreLoginResponse: ->
preloginPayload = new PreloginPayload(@messageBuffer)
@debug.payload(preloginPayload.toString(' '))
@debug.payload(->
preloginPayload.toString(' ')
)

sendLogin7Packet: ->
loginData =
Expand All @@ -256,7 +260,9 @@ class Connection extends EventEmitter

payload = new Login7Payload(loginData)
@messageIo.sendMessage(TYPE.LOGIN7, payload.data)
@debug.payload(payload.toString(' '))
@debug.payload(->
payload.toString(' ')
)

sendPacketToTokenStreamParser: (packet) ->
@tokenStreamParser.addBuffer(packet.data())
Expand All @@ -281,7 +287,9 @@ class Connection extends EventEmitter

payload = new SqlBatchPayload(request.sqlText)
@messageIo.sendMessage(TYPE.SQL_BATCH, payload.data)
@debug.payload(payload.toString(' '))
@debug.payload(->
payload.toString(' ')
)

@transitionTo(@STATE.SENT_CLIENT_REQUEST)

Expand Down
4 changes: 2 additions & 2 deletions lib/debug.coffee
Expand Up @@ -24,9 +24,9 @@ class Debug extends EventEmitter
if @haveListeners() && @options.data
@log(packet.dataToString(@indent))

payload: (payload) ->
payload: (generatePayloadText) ->
if @haveListeners() && @options.payload
@log(payload)
@log(generatePayloadText())

token: (token) ->
if @haveListeners() && @options.token
Expand Down
4 changes: 3 additions & 1 deletion test/unit/debug-test.coffee
Expand Up @@ -35,7 +35,9 @@ exports.payloadEnabled = (test) ->
test.done()
)

debug.payload(payload)
debug.payload(->
payload
)

exports.payloadNotEnabled = (test) ->
debug = new Debug()
Expand Down

0 comments on commit 5b77e6b

Please sign in to comment.