Nits

Author: jedisct1

dnscrypt-proxy/config_loader.go

@@ -16,6 +16,14 @@ import (
 	netproxy "golang.org/x/net/proxy"
 )
 
+func normalizeLogFormat(format *string) {
+	if len(*format) == 0 {
+		*format = "tsv"
+	} else {
+		*format = strings.ToLower(*format)
+	}
+}
+
 // configureLogging - Configure logging based on the configuration
 func configureLogging(proxy *Proxy, flags *ConfigFlags, config *Config) {
 	if config.LogLevel >= 0 && config.LogLevel < int(dlog.SeverityLast) {
@@ -279,11 +287,7 @@ func configureEDNSClientSubnet(proxy *Proxy, config *Config) error {
 
 // configureQueryLog - Configures query logging
 func configureQueryLog(proxy *Proxy, config *Config) error {
-	if len(config.QueryLog.Format) == 0 {
-		config.QueryLog.Format = "tsv"
-	} else {
-		config.QueryLog.Format = strings.ToLower(config.QueryLog.Format)
-	}
+	normalizeLogFormat(&config.QueryLog.Format)
 	if config.QueryLog.Format != "tsv" && config.QueryLog.Format != "ltsv" {
 		return errors.New("Unsupported query log format")
 	}
@@ -296,11 +300,7 @@ func configureQueryLog(proxy *Proxy, config *Config) error {
 
 // configureNXLog - Configures NX domain logging
 func configureNXLog(proxy *Proxy, config *Config) error {
-	if len(config.NxLog.Format) == 0 {
-		config.NxLog.Format = "tsv"
-	} else {
-		config.NxLog.Format = strings.ToLower(config.NxLog.Format)
-	}
+	normalizeLogFormat(&config.NxLog.Format)
 	if config.NxLog.Format != "tsv" && config.NxLog.Format != "ltsv" {
 		return errors.New("Unsupported NX log format")
 	}
@@ -321,11 +321,7 @@ func configureBlockedNames(proxy *Proxy, config *Config) error {
 		config.BlockName.Format = config.BlockNameLegacy.Format
 		config.BlockName.LogFile = config.BlockNameLegacy.LogFile
 	}
-	if len(config.BlockName.Format) == 0 {
-		config.BlockName.Format = "tsv"
-	} else {
-		config.BlockName.Format = strings.ToLower(config.BlockName.Format)
-	}
+	normalizeLogFormat(&config.BlockName.Format)
 	if config.BlockName.Format != "tsv" && config.BlockName.Format != "ltsv" {
 		return errors.New("Unsupported block log format")
 	}
@@ -347,11 +343,7 @@ func configureAllowedNames(proxy *Proxy, config *Config) error {
 		config.AllowedName.Format = config.WhitelistNameLegacy.Format
 		config.AllowedName.LogFile = config.WhitelistNameLegacy.LogFile
 	}
-	if len(config.AllowedName.Format) == 0 {
-		config.AllowedName.Format = "tsv"
-	} else {
-		config.AllowedName.Format = strings.ToLower(config.AllowedName.Format)
-	}
+	normalizeLogFormat(&config.AllowedName.Format)
 	if config.AllowedName.Format != "tsv" && config.AllowedName.Format != "ltsv" {
 		return errors.New("Unsupported allowed_names log format")
 	}
@@ -373,11 +365,7 @@ func configureBlockedIPs(proxy *Proxy, config *Config) error {
 		config.BlockIP.Format = config.BlockIPLegacy.Format
 		config.BlockIP.LogFile = config.BlockIPLegacy.LogFile
 	}
-	if len(config.BlockIP.Format) == 0 {
-		config.BlockIP.Format = "tsv"
-	} else {
-		config.BlockIP.Format = strings.ToLower(config.BlockIP.Format)
-	}
+	normalizeLogFormat(&config.BlockIP.Format)
 	if config.BlockIP.Format != "tsv" && config.BlockIP.Format != "ltsv" {
 		return errors.New("Unsupported IP block log format")
 	}
@@ -390,11 +378,7 @@ func configureBlockedIPs(proxy *Proxy, config *Config) error {
 
 // configureAllowedIPs - Configures allowed IPs
 func configureAllowedIPs(proxy *Proxy, config *Config) error {
-	if len(config.AllowIP.Format) == 0 {
-		config.AllowIP.Format = "tsv"
-	} else {
-		config.AllowIP.Format = strings.ToLower(config.AllowIP.Format)
-	}
+	normalizeLogFormat(&config.AllowIP.Format)
 	if config.AllowIP.Format != "tsv" && config.AllowIP.Format != "ltsv" {
 		return errors.New("Unsupported allowed_ips log format")
 	}