simplify calling dialer

Author: methane

connector.go

@@ -87,29 +87,24 @@ func (c *connector) Connect(ctx context.Context) (driver.Conn, error) {
 	mc.parseTime = mc.cfg.ParseTime
 
 	// Connect to Server
+	dctx := ctx
+	if mc.cfg.Timeout > 0 {
+		var cancel context.CancelFunc
+		dctx, cancel = context.WithTimeout(ctx, c.cfg.Timeout)
+		defer cancel()
+	}
+
 	if c.cfg.DialFunc != nil {
-		dctx := ctx
-		if mc.cfg.Timeout > 0 {
-			var cancel context.CancelFunc
-			dctx, cancel = context.WithTimeout(ctx, c.cfg.Timeout)
-			defer cancel()
-		}
 		mc.netConn, err = c.cfg.DialFunc(dctx, mc.cfg.Net, mc.cfg.Addr)
 	} else {
 		dialsLock.RLock()
 		dial, ok := dials[mc.cfg.Net]
 		dialsLock.RUnlock()
 		if ok {
-			dctx := ctx
-			if mc.cfg.Timeout > 0 {
-				var cancel context.CancelFunc
-				dctx, cancel = context.WithTimeout(ctx, c.cfg.Timeout)
-				defer cancel()
-			}
 			mc.netConn, err = dial(dctx, mc.cfg.Addr)
 		} else {
-			nd := net.Dialer{Timeout: mc.cfg.Timeout}
-			mc.netConn, err = nd.DialContext(ctx, mc.cfg.Net, mc.cfg.Addr)
+			nd := net.Dialer{}
+			mc.netConn, err = nd.DialContext(dctx, mc.cfg.Net, mc.cfg.Addr)
 		}
 	}
 	if err != nil {