From 5738b62ed95caf6a6734bd8d653755d0afbd7479 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Fri, 27 Jun 2014 14:47:39 +0200 Subject: [PATCH 01/25] trying modif --- conn.go | 1 + 1 file changed, 1 insertion(+) diff --git a/conn.go b/conn.go index 7d92919..bab7789 100644 --- a/conn.go +++ b/conn.go @@ -304,6 +304,7 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { params.User = env } + newConn.logf(LogPanic, "", "FIRST LOG") tcpConn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", params.Host, params.Port)) panicIfErr(err) From 2f3502254a82ac96059475aeba77a2403415f6af Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Fri, 27 Jun 2014 14:55:58 +0200 Subject: [PATCH 02/25] trying modif --- conn.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conn.go b/conn.go index bab7789..17ca797 100644 --- a/conn.go +++ b/conn.go @@ -304,7 +304,7 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { params.User = env } - newConn.logf(LogPanic, "", "FIRST LOG") + newConn.log(LogPanic, "FIRST LOG") tcpConn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", params.Host, params.Port)) panicIfErr(err) From c611751049fb3a26ec16bcd98a22ab7ceae5a775 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Fri, 27 Jun 2014 18:10:19 +0200 Subject: [PATCH 03/25] trying modif --- conn.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conn.go b/conn.go index 17ca797..09df373 100644 --- a/conn.go +++ b/conn.go @@ -304,7 +304,7 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { params.User = env } - newConn.log(LogPanic, "FIRST LOG") + newConn.log(newConn.LogDebug, "FIRST LOG") tcpConn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", params.Host, params.Port)) panicIfErr(err) From 733e525c5b78b87c2e22854e437d8137f9b8c2a0 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Fri, 27 Jun 2014 18:14:21 +0200 Subject: [PATCH 04/25] trying modif --- conn.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conn.go b/conn.go index 09df373..17ca797 100644 --- a/conn.go +++ b/conn.go @@ -304,7 +304,7 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { params.User = env } - newConn.log(newConn.LogDebug, "FIRST LOG") + newConn.log(LogPanic, "FIRST LOG") tcpConn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", params.Host, params.Port)) panicIfErr(err) From e36e35c31d4a69aad38cdca17455c85d0b099604 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Fri, 27 Jun 2014 18:17:06 +0200 Subject: [PATCH 05/25] trying modif --- conn.go | 1 + 1 file changed, 1 insertion(+) diff --git a/conn.go b/conn.go index 17ca797..7272b8c 100644 --- a/conn.go +++ b/conn.go @@ -332,6 +332,7 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { newConn.transactionStatus = NotInTransaction conn = newConn + conn.log(LogPanic, "FIRST LOG") return } From 385f3a31bcdf5ae1cc7101814281ca53a34e136c Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Fri, 27 Jun 2014 18:23:13 +0200 Subject: [PATCH 06/25] trying modif --- conn.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conn.go b/conn.go index 7272b8c..6626094 100644 --- a/conn.go +++ b/conn.go @@ -304,7 +304,7 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { params.User = env } - newConn.log(LogPanic, "FIRST LOG") + //newConn.log(LogPanic, "FIRST LOG") tcpConn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", params.Host, params.Port)) panicIfErr(err) @@ -332,7 +332,7 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { newConn.transactionStatus = NotInTransaction conn = newConn - conn.log(LogPanic, "FIRST LOG") + //conn.log(LogPanic, "FIRST LOG") return } From af01779002a72fba546487f6025c31d46555b7b9 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Fri, 27 Jun 2014 18:30:31 +0200 Subject: [PATCH 07/25] trying modif --- conn.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conn.go b/conn.go index 6626094..e7b0c56 100644 --- a/conn.go +++ b/conn.go @@ -12,6 +12,7 @@ import ( "errors" "fmt" "io" + "log" "net" "os" "strconv" @@ -304,7 +305,7 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { params.User = env } - //newConn.log(LogPanic, "FIRST LOG") + log.Print("FIRST LOG") tcpConn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", params.Host, params.Port)) panicIfErr(err) From fa276bbd8feac43ddd8f35a13950ada6fb1e84a0 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Fri, 27 Jun 2014 18:33:12 +0200 Subject: [PATCH 08/25] trying modif --- conn.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conn.go b/conn.go index e7b0c56..a4afa8d 100644 --- a/conn.go +++ b/conn.go @@ -305,7 +305,7 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { params.User = env } - log.Print("FIRST LOG") + log.Print("1st LOG") tcpConn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", params.Host, params.Port)) panicIfErr(err) @@ -323,8 +323,10 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { newConn.onErrorDontRequireReadyForQuery = false }() + log.Print("2nd LOG") newConn.writeStartup() + log.Print("3rd LOG") newConn.readBackendMessages(nil) newConn.state = readyState{} From a16ecdc2d4bbd120440ffa969a39fd18a6a0f389 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Fri, 27 Jun 2014 18:35:19 +0200 Subject: [PATCH 09/25] trying modif --- conn_write.go | 1 + 1 file changed, 1 insertion(+) diff --git a/conn_write.go b/conn_write.go index f9efcb4..787d72d 100644 --- a/conn_write.go +++ b/conn_write.go @@ -307,6 +307,7 @@ func (conn *Conn) writeQuery(command string) { } func (conn *Conn) writeStartup() { + conn.log(LogDebug, "Inside writeStartup") if conn.LogLevel >= LogDebug { defer conn.logExit(conn.logEnter("*Conn.writeStartup")) } From c2d65308924f4c36b89f569be4c4343f4e0f3150 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Fri, 27 Jun 2014 18:44:06 +0200 Subject: [PATCH 10/25] trying modif --- conn.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conn.go b/conn.go index a4afa8d..9bfbe80 100644 --- a/conn.go +++ b/conn.go @@ -309,7 +309,7 @@ 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))) + //panicIfErr(tcpConn.SetDeadline(time.Unix(int64(params.TimeoutSeconds*1000*1000*1000), 0))) newConn.tcpConn = tcpConn From fe0bf8ee2e3d6fa60d55805a24995e5041fab450 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Fri, 27 Jun 2014 18:44:56 +0200 Subject: [PATCH 11/25] trying modif --- conn.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conn.go b/conn.go index 9bfbe80..a81043f 100644 --- a/conn.go +++ b/conn.go @@ -17,7 +17,7 @@ import ( "os" "strconv" "strings" - "time" +// "time" ) // LogLevel is used to control what is written to the log. From 9c80c399e84ddd74ea1e19a37d9e2b23c8d78342 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Mon, 30 Jun 2014 13:11:29 +0200 Subject: [PATCH 12/25] changing the deadline code --- conn.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conn.go b/conn.go index a81043f..d5f2ac9 100644 --- a/conn.go +++ b/conn.go @@ -309,6 +309,12 @@ 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) + log.Printf("TimeoutSeconds: %d", TimeoutSeconds) + if TimeoutSeconds <= 0 { + panicIfErr(tcpConn.SetDeadline(0)) + } else { + panicIfErr(tcpConn.SetDeadline(time.Now().Add(TimeoutSeconds*time.Seconds))) + } //panicIfErr(tcpConn.SetDeadline(time.Unix(int64(params.TimeoutSeconds*1000*1000*1000), 0))) newConn.tcpConn = tcpConn From 19ad8b2d73f291d369c2ce7b8deea0f864f461f7 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Mon, 30 Jun 2014 13:14:23 +0200 Subject: [PATCH 13/25] changing the deadline code --- conn.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conn.go b/conn.go index d5f2ac9..99ac0b9 100644 --- a/conn.go +++ b/conn.go @@ -309,11 +309,11 @@ 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) - log.Printf("TimeoutSeconds: %d", TimeoutSeconds) - if TimeoutSeconds <= 0 { + log.Printf("TimeoutSeconds: %d", params.TimeoutSeconds) + if params.TimeoutSeconds <= 0 { panicIfErr(tcpConn.SetDeadline(0)) } else { - panicIfErr(tcpConn.SetDeadline(time.Now().Add(TimeoutSeconds*time.Seconds))) + panicIfErr(tcpConn.SetDeadline(time.Now().Add(params.TimeoutSeconds*time.Seconds))) } //panicIfErr(tcpConn.SetDeadline(time.Unix(int64(params.TimeoutSeconds*1000*1000*1000), 0))) From 7e26f774300eaeb7614ad4fa06f31f4ec4336730 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Mon, 30 Jun 2014 13:16:51 +0200 Subject: [PATCH 14/25] changing the deadline code --- conn.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conn.go b/conn.go index 99ac0b9..90c54e1 100644 --- a/conn.go +++ b/conn.go @@ -311,7 +311,7 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { log.Printf("TimeoutSeconds: %d", params.TimeoutSeconds) if params.TimeoutSeconds <= 0 { - panicIfErr(tcpConn.SetDeadline(0)) + panicIfErr(tcpConn.SetDeadline(noDeadline)) } else { panicIfErr(tcpConn.SetDeadline(time.Now().Add(params.TimeoutSeconds*time.Seconds))) } From 15f0c17d6e05ee5abae14cd2d8430a8ec42ad4a8 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Mon, 30 Jun 2014 13:20:10 +0200 Subject: [PATCH 15/25] changing the deadline code --- conn.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conn.go b/conn.go index 90c54e1..07044ce 100644 --- a/conn.go +++ b/conn.go @@ -311,7 +311,7 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { log.Printf("TimeoutSeconds: %d", params.TimeoutSeconds) if params.TimeoutSeconds <= 0 { - panicIfErr(tcpConn.SetDeadline(noDeadline)) + panicIfErr(tcpConn.SetDeadline(net.noDeadline)) } else { panicIfErr(tcpConn.SetDeadline(time.Now().Add(params.TimeoutSeconds*time.Seconds))) } From a8b5aa30eb03550e2b87e9663ac7df25bcd26fae Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Mon, 30 Jun 2014 13:22:06 +0200 Subject: [PATCH 16/25] changing the deadline code --- conn.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conn.go b/conn.go index 07044ce..1390210 100644 --- a/conn.go +++ b/conn.go @@ -310,8 +310,9 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { panicIfErr(err) log.Printf("TimeoutSeconds: %d", params.TimeoutSeconds) + var noDeadline = time.Time{} if params.TimeoutSeconds <= 0 { - panicIfErr(tcpConn.SetDeadline(net.noDeadline)) + panicIfErr(tcpConn.SetDeadline(noDeadline)) } else { panicIfErr(tcpConn.SetDeadline(time.Now().Add(params.TimeoutSeconds*time.Seconds))) } From 97732dfbadb8649e0b66d2ea2a8a68802ebd7683 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Mon, 30 Jun 2014 13:22:57 +0200 Subject: [PATCH 17/25] changing the deadline code --- conn.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conn.go b/conn.go index 1390210..9582f71 100644 --- a/conn.go +++ b/conn.go @@ -310,7 +310,7 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { panicIfErr(err) log.Printf("TimeoutSeconds: %d", params.TimeoutSeconds) - var noDeadline = time.Time{} + noDeadline := time.Time{} if params.TimeoutSeconds <= 0 { panicIfErr(tcpConn.SetDeadline(noDeadline)) } else { From 8a47c8bbc7634289262b10a66ddd43995b3827e8 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Mon, 30 Jun 2014 13:23:32 +0200 Subject: [PATCH 18/25] adding time package --- conn.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conn.go b/conn.go index 9582f71..d02e905 100644 --- a/conn.go +++ b/conn.go @@ -17,7 +17,7 @@ import ( "os" "strconv" "strings" -// "time" + "time" ) // LogLevel is used to control what is written to the log. From 655886a58e9fa70d0661c815dcea9190366f972d Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Mon, 30 Jun 2014 13:24:45 +0200 Subject: [PATCH 19/25] adding time package --- conn.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conn.go b/conn.go index d02e905..643324c 100644 --- a/conn.go +++ b/conn.go @@ -314,7 +314,7 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { if params.TimeoutSeconds <= 0 { panicIfErr(tcpConn.SetDeadline(noDeadline)) } else { - panicIfErr(tcpConn.SetDeadline(time.Now().Add(params.TimeoutSeconds*time.Seconds))) + panicIfErr(tcpConn.SetDeadline(time.Now().Add(params.TimeoutSeconds*time.Seconds()))) } //panicIfErr(tcpConn.SetDeadline(time.Unix(int64(params.TimeoutSeconds*1000*1000*1000), 0))) From 329cd545b99e413bec2ba1d85d087f013a9abe8d Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Mon, 30 Jun 2014 13:26:20 +0200 Subject: [PATCH 20/25] adding time package --- conn.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conn.go b/conn.go index 643324c..4076e8c 100644 --- a/conn.go +++ b/conn.go @@ -314,7 +314,7 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { if params.TimeoutSeconds <= 0 { panicIfErr(tcpConn.SetDeadline(noDeadline)) } else { - panicIfErr(tcpConn.SetDeadline(time.Now().Add(params.TimeoutSeconds*time.Seconds()))) + panicIfErr(tcpConn.SetDeadline(time.Now().Add(params.TimeoutSeconds*time.Second))) } //panicIfErr(tcpConn.SetDeadline(time.Unix(int64(params.TimeoutSeconds*1000*1000*1000), 0))) From a8190fffe4fd7fd6dbb31e76b063d0fcf37872be Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Mon, 30 Jun 2014 13:28:07 +0200 Subject: [PATCH 21/25] correct typing of duration --- conn.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conn.go b/conn.go index 4076e8c..19d6cb5 100644 --- a/conn.go +++ b/conn.go @@ -314,7 +314,7 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { if params.TimeoutSeconds <= 0 { panicIfErr(tcpConn.SetDeadline(noDeadline)) } else { - panicIfErr(tcpConn.SetDeadline(time.Now().Add(params.TimeoutSeconds*time.Second))) + panicIfErr(tcpConn.SetDeadline(time.Now().Add(time.Duration(params.TimeoutSeconds)*time.Second))) } //panicIfErr(tcpConn.SetDeadline(time.Unix(int64(params.TimeoutSeconds*1000*1000*1000), 0))) From bf49dba012aa49741a0dafe4ee127654801967e7 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Mon, 30 Jun 2014 13:30:49 +0200 Subject: [PATCH 22/25] tidying --- conn.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/conn.go b/conn.go index 19d6cb5..825a653 100644 --- a/conn.go +++ b/conn.go @@ -305,18 +305,17 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { params.User = env } - log.Print("1st LOG") tcpConn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", params.Host, params.Port)) panicIfErr(err) - log.Printf("TimeoutSeconds: %d", params.TimeoutSeconds) + // 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))) } - //panicIfErr(tcpConn.SetDeadline(time.Unix(int64(params.TimeoutSeconds*1000*1000*1000), 0))) newConn.tcpConn = tcpConn @@ -330,10 +329,8 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { newConn.onErrorDontRequireReadyForQuery = false }() - log.Print("2nd LOG") newConn.writeStartup() - log.Print("3rd LOG") newConn.readBackendMessages(nil) newConn.state = readyState{} From 0dc85cbda83b70d909575e5717222d3b3d196b63 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Mon, 30 Jun 2014 13:37:05 +0200 Subject: [PATCH 23/25] tidying --- conn.go | 1 - 1 file changed, 1 deletion(-) diff --git a/conn.go b/conn.go index 825a653..7575717 100644 --- a/conn.go +++ b/conn.go @@ -12,7 +12,6 @@ import ( "errors" "fmt" "io" - "log" "net" "os" "strconv" From b76a773920b4e93e3fc9645c7bd5d6842ba9e768 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Mon, 30 Jun 2014 13:39:02 +0200 Subject: [PATCH 24/25] tidying --- conn.go | 1 - 1 file changed, 1 deletion(-) diff --git a/conn.go b/conn.go index 7575717..81d432b 100644 --- a/conn.go +++ b/conn.go @@ -338,7 +338,6 @@ func Connect(connStr string, logLevel LogLevel) (conn *Conn, err error) { newConn.transactionStatus = NotInTransaction conn = newConn - //conn.log(LogPanic, "FIRST LOG") return } From 9054a7900cdda46b197c4a60847891adb3ae4f95 Mon Sep 17 00:00:00 2001 From: Oscar Ayoun Date: Mon, 30 Jun 2014 13:40:06 +0200 Subject: [PATCH 25/25] tidying --- conn_write.go | 1 - 1 file changed, 1 deletion(-) diff --git a/conn_write.go b/conn_write.go index 787d72d..f9efcb4 100644 --- a/conn_write.go +++ b/conn_write.go @@ -307,7 +307,6 @@ func (conn *Conn) writeQuery(command string) { } func (conn *Conn) writeStartup() { - conn.log(LogDebug, "Inside writeStartup") if conn.LogLevel >= LogDebug { defer conn.logExit(conn.logEnter("*Conn.writeStartup")) }