Skip to content
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

Fixing the go1.3 compatibility issue #20

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Fixing the go1.3 compatibility issue #20

Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5738b62
trying modif
Jun 27, 2014
2f35022
trying modif
Jun 27, 2014
c611751
trying modif
Jun 27, 2014
733e525
trying modif
Jun 27, 2014
e36e35c
trying modif
Jun 27, 2014
385f3a3
trying modif
Jun 27, 2014
af01779
trying modif
Jun 27, 2014
fa276bb
trying modif
Jun 27, 2014
a16ecdc
trying modif
Jun 27, 2014
c2d6530
trying modif
Jun 27, 2014
fe0bf8e
trying modif
Jun 27, 2014
9c80c39
changing the deadline code
Jun 30, 2014
19ad8b2
changing the deadline code
Jun 30, 2014
7e26f77
changing the deadline code
Jun 30, 2014
15f0c17
changing the deadline code
Jun 30, 2014
a8b5aa3
changing the deadline code
Jun 30, 2014
97732df
changing the deadline code
Jun 30, 2014
8a47c8b
adding time package
Jun 30, 2014
655886a
adding time package
Jun 30, 2014
329cd54
adding time package
Jun 30, 2014
a8190ff
correct typing of duration
Jun 30, 2014
bf49dba
tidying
Jun 30, 2014
0dc85cb
tidying
Jun 30, 2014
b76a773
tidying
Jun 30, 2014
9054a79
tidying
Jun 30, 2014
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
9 changes: 8 additions & 1 deletion conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,14 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) {
tcpConn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", params.Host, params.Port))
panicIfErr(err)

panicIfErr(tcpConn.SetDeadline(time.Unix(int64(params.TimeoutSeconds*1000*1000*1000), 0)))
// Handling the timeout using SetDeadline and an absolute date
// 0 if no timeout
noDeadline := time.Time{}
if params.TimeoutSeconds <= 0 {
panicIfErr(tcpConn.SetDeadline(noDeadline))
} else {
panicIfErr(tcpConn.SetDeadline(time.Now().Add(time.Duration(params.TimeoutSeconds)*time.Second)))
}

newConn.tcpConn = tcpConn

Expand Down