@@ -100,7 +100,7 @@ func (d defaultLogger) Report(event ConnLogKind, conn *Connection, v ...interfac
100
100
conn .Addr (), err )
101
101
case LogUnexpectedResultId :
102
102
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)" ,
104
104
conn .Addr (), header .RequestId )
105
105
case LogWatchEventReadFailed :
106
106
err := v [0 ].(error )
@@ -940,7 +940,7 @@ func (conn *Connection) newFuture(req Request) (fut *Future) {
940
940
if ctx != nil {
941
941
select {
942
942
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 ))
944
944
shard .rmut .Unlock ()
945
945
return
946
946
default :
@@ -982,7 +982,7 @@ func (conn *Connection) contextWatchdog(fut *Future, ctx context.Context) {
982
982
case <- fut .done :
983
983
return
984
984
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 ))
986
986
}
987
987
}
988
988
@@ -1008,7 +1008,7 @@ func (conn *Connection) send(req Request, streamId uint64) *Future {
1008
1008
if req .Ctx () != nil {
1009
1009
select {
1010
1010
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 ))
1012
1012
return fut
1013
1013
default :
1014
1014
}
0 commit comments