Skip to content

Conditionally compile with net.Dialer.KeepAlive option if go >= 1.3 #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
denisenkom merged 1 commit into from
Mar 29, 2015
Merged

Conditionally compile with net.Dialer.KeepAlive option if go >= 1.3 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions mssql_go1.3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// +build go1.3

package mssql

import (
"net"
)

func createDialer(p *connectParams) *net.Dialer {
return &net.Dialer{Timeout: p.dial_timeout, KeepAlive: p.keepAlive}
}
11 changes: 11 additions & 0 deletions mssql_go1.3pre.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// +build !go1.3

package mssql

import (
"net"
)

func createDialer(p *connectParams) *net.Dialer {
return &net.Dialer{Timeout: p.dial_timeout}
}
2 changes: 1 addition & 1 deletion tds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ func connect(params map[string]string) (res *tdsSession, err error) {
return nil, err
}
addr := p.host + ":" + strconv.FormatUint(p.port, 10)
d := net.Dialer{Timeout: p.dial_timeout, KeepAlive: p.keepAlive}
d := createDialer(p)
conn, err := d.Dial("tcp", addr)
if err != nil {
f := "Unable to open tcp connection with host '%v': %v"
Expand Down