Fix invalid DSN after dsnAddTimeout and "" DSN

influxdata · Mar 1, 2016 · ca3a80f · ca3a80f
1 parent f0747e7
commit ca3a80f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
@@ -216,6 +216,12 @@ func (m *Mysql) gatherServer(serv string, acc telegraf.Accumulator) error {
 }
 
 func dsnAddTimeout(dsn string) (string, error) {
+
+	// DSN "?timeout=5s" is not valid, but "/?timeout=5s" is valid ("" and "/"
+	// are the same DSN)
+	if dsn == "" {
+		dsn = "/"
+	}
 	u, err := url.Parse(dsn)
 	if err != nil {
 		return "", err

diff --git a/plugins/inputs/mysql/mysql_test.go b/plugins/inputs/mysql/mysql_test.go
@@ -92,11 +92,7 @@ func TestMysqlDNSAddTimeout(t *testing.T) {
 	}{
 		{
 			"",
-			"?timeout=5s",
-		},
-		{
-			"127.0.0.1",
-			"127.0.0.1?timeout=5s",
+			"/?timeout=5",
 		},
 		{
 			"tcp(192.168.1.1:3306)/",