utils: move TLSConfig lock and clone logic to helper func

Author: julienschmidt

dsn.go

@@ -528,11 +528,7 @@ func parseDSNParams(cfg *Config, params string) (err error) {
 					return fmt.Errorf("invalid value for TLS config name: %v", err)
 				}
 
-				tlsConfigLock.RLock()
-				if tlsConfig, ok := tlsConfigRegister[name]; ok {
-					tlsConfig = cloneTLSConfig(tlsConfig)
-					tlsConfigLock.RUnlock()
-
+				if tlsConfig := getTLSConfigClone(name); tlsConfig != nil {
 					if len(tlsConfig.ServerName) == 0 && !tlsConfig.InsecureSkipVerify {
 						host, _, err := net.SplitHostPort(cfg.Addr)
 						if err == nil {
@@ -543,7 +539,6 @@ func parseDSNParams(cfg *Config, params string) (err error) {
 					cfg.TLSConfig = name
 					cfg.tls = tlsConfig
 				} else {
-					tlsConfigLock.RUnlock()
 					return errors.New("invalid value / unknown config name: " + name)
 				}
 			}

utils.go

@@ -74,6 +74,15 @@ func DeregisterTLSConfig(key string) {
 	tlsConfigLock.Unlock()
 }
 
+func getTLSConfigClone(key string) (config *tls.Config) {
+	tlsConfigLock.RLock()
+	if v, ok := tlsConfigRegister[key]; ok {
+		config = cloneTLSConfig(v)
+	}
+	tlsConfigLock.RUnlock()
+	return
+}
+
 // Returns the bool value of the input.
 // The 2nd return value indicates if the input was a valid bool value
 func readBool(input string) (value bool, valid bool) {