Skip to content

Commit

Permalink
add packet sequence to log
Browse files Browse the repository at this point in the history
  • Loading branch information
@andeya
andeya committed Nov 15, 2017
1 parent b44aecc commit 6e9d9be
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
8 changes: 4 additions & 4 deletions context.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,11 @@ func (c *readHandleCtx) handle() {
c.output.Header.StatusCode = StatusUnsupportedTx
c.output.Header.Status = StatusText(StatusUnsupportedTx)
if c.sess.peer.printBody {
logformat := "disconnect(%s) due to unsupported type: %d |\nuri: %-30s |\nRECV:\n size: %d\n body[-json]: %s\n"
Errorf(logformat, c.Ip(), c.input.Header.Type, c.input.Header.Uri, c.input.Size, bodyLogBytes(c.input))
logformat := "disconnect(%s) due to unsupported type: %d |\nseq: %d |uri: %-30s |\nRECV:\n size: %d\n body[-json]: %s\n"
Errorf(logformat, c.Ip(), c.input.Header.Type, c.input.Header.Seq, c.input.Header.Uri, c.input.Size, bodyLogBytes(c.input))
} else {
logformat := "disconnect(%s) due to unsupported type: %d |\nuri: %-30s |\nRECV:\n size: %d\n"
Errorf(logformat, c.Ip(), c.input.Header.Type, c.input.Header.Uri, c.input.Size)
logformat := "disconnect(%s) due to unsupported type: %d |\nseq: %d |uri: %-30s |\nRECV:\n size: %d\n"
Errorf(logformat, c.Ip(), c.input.Header.Type, c.input.Header.Seq, c.input.Header.Uri, c.input.Size)
}
go c.sess.Close()
}
Expand Down
32 changes: 16 additions & 16 deletions session.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -550,39 +550,39 @@ func (s *session) runlog(costTime time.Duration, input, output *socket.Packet) {
switch {
case isPushLaunch(input, output):
if s.peer.printBody {
logformat := "[push-launch] remote-ip: %s | cost-time: %s%s | uri: %-30s |\nSEND:\n size: %d\n body[-json]: %s\n"
printFunc(logformat, s.RemoteIp(), costTime, slowStr, output.Header.Uri, output.Size, bodyLogBytes(output))
logformat := "[push-launch] remote-ip: %s | seq: %d | cost-time: %s%s | uri: %-30s |\nSEND:\n size: %d\n body[-json]: %s\n"
printFunc(logformat, s.RemoteIp(), output.Header.Seq, costTime, slowStr, output.Header.Uri, output.Size, bodyLogBytes(output))

} else {
logformat := "[push-launch] remote-ip: %s | cost-time: %s%s | uri: %-30s |\nSEND:\n size: %d\n"
printFunc(logformat, s.RemoteIp(), costTime, slowStr, output.Header.Uri, output.Size)
logformat := "[push-launch] remote-ip: %s | seq: %d | cost-time: %s%s | uri: %-30s |\nSEND:\n size: %d\n"
printFunc(logformat, s.RemoteIp(), output.Header.Seq, costTime, slowStr, output.Header.Uri, output.Size)
}

case isPushHandle(input, output):
if s.peer.printBody {
logformat := "[push-handle] remote-ip: %s | cost-time: %s%s | uri: %-30s |\nRECV:\n size: %d\n body[-json]: %s\n"
printFunc(logformat, s.RemoteIp(), costTime, slowStr, input.Header.Uri, input.Size, bodyLogBytes(input))
logformat := "[push-handle] remote-ip: %s | seq: %d | cost-time: %s%s | uri: %-30s |\nRECV:\n size: %d\n body[-json]: %s\n"
printFunc(logformat, s.RemoteIp(), input.Header.Seq, costTime, slowStr, input.Header.Uri, input.Size, bodyLogBytes(input))
} else {
logformat := "[push-handle] remote-ip: %s | cost-time: %s%s | uri: %-30s |\nRECV:\n size: %d\n"
printFunc(logformat, s.RemoteIp(), costTime, slowStr, input.Header.Uri, input.Size)
logformat := "[push-handle] remote-ip: %s | seq: %d | cost-time: %s%s | uri: %-30s |\nRECV:\n size: %d\n"
printFunc(logformat, s.RemoteIp(), input.Header.Seq, costTime, slowStr, input.Header.Uri, input.Size)
}

case isPullLaunch(input, output):
if s.peer.printBody {
logformat := "[pull-launch] remote-ip: %s | cost-time: %s%s | uri: %-30s |\nSEND:\n size: %d\n body[-json]: %s\nRECV:\n status: %s %s\n size: %d\n body[-json]: %s\n"
printFunc(logformat, s.RemoteIp(), costTime, slowStr, output.Header.Uri, output.Size, bodyLogBytes(output), colorCode(input.Header.StatusCode), input.Header.Status, input.Size, bodyLogBytes(input))
logformat := "[pull-launch] remote-ip: %s | seq: %d | cost-time: %s%s | uri: %-30s |\nSEND:\n size: %d\n body[-json]: %s\nRECV:\n status: %s %s\n size: %d\n body[-json]: %s\n"
printFunc(logformat, s.RemoteIp(), output.Header.Seq, costTime, slowStr, output.Header.Uri, output.Size, bodyLogBytes(output), colorCode(input.Header.StatusCode), input.Header.Status, input.Size, bodyLogBytes(input))
} else {
logformat := "[pull-launch] remote-ip: %s | cost-time: %s%s | uri: %-30s |\nSEND:\n size: %d\nRECV:\n status: %s %s\n size: %d\n"
printFunc(logformat, s.RemoteIp(), costTime, slowStr, output.Header.Uri, output.Size, colorCode(input.Header.StatusCode), input.Header.Status, input.Size)
logformat := "[pull-launch] remote-ip: %s | seq: %d | cost-time: %s%s | uri: %-30s |\nSEND:\n size: %d\nRECV:\n status: %s %s\n size: %d\n"
printFunc(logformat, s.RemoteIp(), output.Header.Seq, costTime, slowStr, output.Header.Uri, output.Size, colorCode(input.Header.StatusCode), input.Header.Status, input.Size)
}

case isPullHandle(input, output):
if s.peer.printBody {
logformat := "[pull-handle] remote-ip: %s | cost-time: %s%s | uri: %-30s |\nRECV:\n size: %d\n body[-json]: %s\nSEND:\n status: %s %s\n size: %d\n body[-json]: %s\n"
printFunc(logformat, s.RemoteIp(), costTime, slowStr, input.Header.Uri, input.Size, bodyLogBytes(input), colorCode(output.Header.StatusCode), output.Header.Status, output.Size, bodyLogBytes(output))
logformat := "[pull-handle] remote-ip: %s | seq: %d | cost-time: %s%s | uri: %-30s |\nRECV:\n size: %d\n body[-json]: %s\nSEND:\n status: %s %s\n size: %d\n body[-json]: %s\n"
printFunc(logformat, s.RemoteIp(), input.Header.Seq, costTime, slowStr, input.Header.Uri, input.Size, bodyLogBytes(input), colorCode(output.Header.StatusCode), output.Header.Status, output.Size, bodyLogBytes(output))
} else {
logformat := "[pull-handle] remote-ip: %s | cost-time: %s%s | uri: %-30s |\nRECV:\n size: %d\nSEND:\n status: %s %s\n size: %d\n"
printFunc(logformat, s.RemoteIp(), costTime, slowStr, input.Header.Uri, input.Size, colorCode(output.Header.StatusCode), output.Header.Status, output.Size)
logformat := "[pull-handle] remote-ip: %s | seq: %d | cost-time: %s%s | uri: %-30s |\nRECV:\n size: %d\nSEND:\n status: %s %s\n size: %d\n"
printFunc(logformat, s.RemoteIp(), input.Header.Seq, costTime, slowStr, input.Header.Uri, input.Size, colorCode(output.Header.StatusCode), output.Header.Status, output.Size)
}
}
}
Expand Down

0 comments on commit 6e9d9be

Please sign in to comment.