re-enable Config.Global.LocalIP

Author: liuzengh

config.go

@@ -676,6 +676,17 @@ func RepairConfig(cfg *Config) error {
 	}
 	codec.SetReaderSize(*cfg.Global.ReadBufferSize)
 
+	// nic -> ip
+	if err := repairServiceIPWithNic(cfg); err != nil {
+		return err
+	}
+
+	// Set empty ip to "0.0.0.0" to prevent malformed key matching
+	// for passed listeners during hot restart.
+	const defaultIP = "0.0.0.0"
+	setDefault(&cfg.Global.LocalIP, defaultIP)
+	setDefault(&cfg.Server.Admin.IP, cfg.Global.LocalIP)
+
 	// protocol network ip empty
 	for _, serviceCfg := range cfg.Server.Service {
 		setDefault(&serviceCfg.Protocol, cfg.Server.Protocol)
@@ -714,17 +725,11 @@ func RepairConfig(cfg *Config) error {
 
 // repairServiceIPWithNic repairs the Config when service ip is empty according to the nic.
 func repairServiceIPWithNic(cfg *Config) error {
-	// Set empty ip to "0.0.0.0" to prevent malformed key matching
-	// for passed listeners during hot restart.
-	const defaultIP = "0.0.0.0"
 	for index, item := range cfg.Server.Service {
 		if item.IP == "" {
 			ip := getIP(item.Nic)
-			if ip == "" {
-				if item.Nic != "" {
-					return fmt.Errorf("can't find service IP by the NIC: %s", item.Nic)
-				}
-				ip = defaultIP
+			if ip == "" && item.Nic != "" {
+				return fmt.Errorf("can't find service IP by the NIC: %s", item.Nic)
 			}
 			cfg.Server.Service[index].IP = ip
 		}
@@ -733,11 +738,8 @@ func repairServiceIPWithNic(cfg *Config) error {
 
 	if cfg.Server.Admin.IP == "" {
 		ip := getIP(cfg.Server.Admin.Nic)
-		if ip == "" {
-			if cfg.Server.Admin.Nic != "" {
-				return fmt.Errorf("can't find admin IP by the NIC: %s", cfg.Server.Admin.Nic)
-			}
-			ip = defaultIP
+		if ip == "" && cfg.Server.Admin.Nic != "" {
+			return fmt.Errorf("can't find admin IP by the NIC: %s", cfg.Server.Admin.Nic)
 		}
 		cfg.Server.Admin.IP = ip
 	}