gopkg/pgx
2
0
Fork 0
Code Activity

Fix racy usage of pgConn.contextWatcher in ayncClose

Browse Source
This commit is contained in:
Jack Christensen
2020-01-12 16:27:46 -06:00
parent a48e9bf63c
commit 0df97353b8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pgconn.go
+4 -3
View File
@@ -518,13 +518,14 @@ func (pgConn *PgConn) ayncClose() {
go func() { go func() {
defer pgConn.conn.Close() defer pgConn.conn.Close()
ctx, cancel := context.WithTimeout(context.Background(), time.Second*15) deadline := time.Now().Add(time.Second * 15)
ctx, cancel := context.WithDeadline(context.Background(), deadline)
defer cancel() defer cancel()
pgConn.CancelRequest(ctx) pgConn.CancelRequest(ctx)
pgConn.contextWatcher.Watch(ctx) pgConn.conn.SetDeadline(deadline)
defer pgConn.contextWatcher.Unwatch()
pgConn.conn.Write([]byte{'X', 0, 0, 0, 4}) pgConn.conn.Write([]byte{'X', 0, 0, 0, 4})
pgConn.conn.Read(make([]byte, 1)) pgConn.conn.Read(make([]byte, 1))