gopkg/pgx
2
0
Fork 0
Code Activity

Ignore errors sending Terminate message while closing connection

Browse Source 
This mimics the behavior of libpq PGfinish.

refs #637
This commit is contained in:
Jack Christensen
2019-11-18 07:24:05 -06:00
parent 9449f4b081
commit eb81d2926b
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pgconn.go
+7 -9
View File
@@ -492,15 +492,13 @@ func (pgConn *PgConn) Close(ctx context.Context) error {
pgConn.contextWatcher.Watch(ctx) pgConn.contextWatcher.Watch(ctx)
defer pgConn.contextWatcher.Unwatch() defer pgConn.contextWatcher.Unwatch()
_, err := pgConn.conn.Write([]byte{'X', 0, 0, 0, 4}) // Ignore any errors sending Terminate message and waiting for server to close connection.
if err != nil { // This mimics the behavior of libpq PQfinish. It calls closePGconn which calls sendTerminateConn which purposefully
return err // ignores errors.
} //
// See https://github.com/jackc/pgx/issues/637
_, err = pgConn.conn.Read(make([]byte, 1)) pgConn.conn.Write([]byte{'X', 0, 0, 0, 4})
if err != io.EOF { pgConn.conn.Read(make([]byte, 1))
return err
}
return pgConn.conn.Close() return pgConn.conn.Close()
} }