DUBBO-175 解决本机IP出错导致Log的递归调用

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@817 1a56cb94-b969-4eaa-88fa-be21384802f2

dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/support/FailsafeLogger.java

@@ -28,7 +28,7 @@ public class FailsafeLogger implements Logger {
 	}
 	
 	private String getContextMessage() {
-	    return ", dubbo version: " + Version.getVersion() + ", current host: " + NetUtils.getLocalHost();
+	    return ", dubbo version: " + Version.getVersion() + ", current host: " + NetUtils.getLogHost();
 	}
 
     public void trace(String msg, Throwable e) {

dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NetUtils.java

@@ -128,7 +128,7 @@ public class NetUtils {
     
     public static String getLocalHost(){
         InetAddress address = getLocalAddress();
-        return address == null ? null : address.getHostAddress();
+        return address == null ? LOCALHOST : address.getHostAddress();
     }
     
     public static String filterLocalHost(String host) {
@@ -146,11 +146,16 @@ public class NetUtils {
      * @return 本地网卡IP
      */
     public static InetAddress getLocalAddress() {
-    	if (LOCAL_ADDRESS != null)
-    		return LOCAL_ADDRESS;
-    	InetAddress localAddress = getLocalAddress0();
-    	LOCAL_ADDRESS = localAddress;
-    	return localAddress;
+        if (LOCAL_ADDRESS != null)
+            return LOCAL_ADDRESS;
+        InetAddress localAddress = getLocalAddress0();
+        LOCAL_ADDRESS = localAddress;
+        return localAddress;
+    }
+    
+    public static String getLogHost() {
+        InetAddress address = LOCAL_ADDRESS;
+        return address == null ? LOCALHOST : address.getHostAddress();
     }
     
     private static InetAddress getLocalAddress0() {
@@ -160,8 +165,8 @@ public class NetUtils {
             if (isValidAddress(localAddress)) {
                 return localAddress;
             }
-        } catch (Throwable e) {
-            logger.warn("Failed to retriving ip address, " + e.getMessage(), e);
+        } catch (Throwable e) {
+            logger.warn("Failed to retriving ip address, " + e.getMessage(), e);
         }
         try {
             Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();