Skip to content

Commit b408001

Browse files
Apply suggestions from code review (#407)
Co-authored-by: Oleg Jukovec <oleg.jukovec@gmail.com>
1 parent 06ed7f8 commit b408001

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Versioning](http://semver.org/spec/v2.0.0.html) except to the first release.
1717
- Implemented stringer methods for pool.Role (#405).
1818

1919
### Changed
20-
- More informative request canceling: log the probable reason for unexpected requestId
21-
and add requestId info to context done error message.
20+
- More informative request canceling: log the probable reason for unexpected request ID
21+
and add request ID info to context done error message (#407).
2222

2323
### Fixed
2424

connection.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func (d defaultLogger) Report(event ConnLogKind, conn *Connection, v ...interfac
100100
conn.Addr(), err)
101101
case LogUnexpectedResultId:
102102
header := v[0].(Header)
103-
log.Printf("tarantool: connection %s got unexpected resultId (%d) in response (probably canceled request)",
103+
log.Printf("tarantool: connection %s got unexpected request ID (%d) in response (probably canceled request)",
104104
conn.Addr(), header.RequestId)
105105
case LogWatchEventReadFailed:
106106
err := v[0].(error)
@@ -940,7 +940,7 @@ func (conn *Connection) newFuture(req Request) (fut *Future) {
940940
if ctx != nil {
941941
select {
942942
case <-ctx.Done():
943-
fut.SetError(fmt.Errorf("context is done (requestId %d)", fut.requestId))
943+
fut.SetError(fmt.Errorf("context is done (request ID %d)", fut.requestId))
944944
shard.rmut.Unlock()
945945
return
946946
default:
@@ -982,7 +982,7 @@ func (conn *Connection) contextWatchdog(fut *Future, ctx context.Context) {
982982
case <-fut.done:
983983
return
984984
default:
985-
conn.cancelFuture(fut, fmt.Errorf("context is done (requestId %d)", fut.requestId))
985+
conn.cancelFuture(fut, fmt.Errorf("context is done (request ID %d)", fut.requestId))
986986
}
987987
}
988988

@@ -1008,7 +1008,7 @@ func (conn *Connection) send(req Request, streamId uint64) *Future {
10081008
if req.Ctx() != nil {
10091009
select {
10101010
case <-req.Ctx().Done():
1011-
conn.cancelFuture(fut, fmt.Errorf("context is done (requestId %d)", fut.requestId))
1011+
conn.cancelFuture(fut, fmt.Errorf("context is done (request ID %d)", fut.requestId))
10121012
return fut
10131013
default:
10141014
}

0 commit comments

Comments
 (0)