From 7808be280a8496e489e513106612bd9248a4dee5 Mon Sep 17 00:00:00 2001
From: "william.liangf" <william.liangf@1a56cb94-b969-4eaa-88fa-be21384802f2>
Date: Fri, 6 Jan 2012 07:08:16 +0000
Subject: [PATCH] =?UTF-8?q?DUBBO-175=09=E8=A7=A3=E5=86=B3=E6=9C=AC?=
 =?UTF-8?q?=E6=9C=BAIP=E5=87=BA=E9=94=99=E5=AF=BC=E8=87=B4Log=E7=9A=84?=
 =?UTF-8?q?=E9=80=92=E5=BD=92=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@817 1a56cb94-b969-4eaa-88fa-be21384802f2
---
 .../common/logger/support/FailsafeLogger.java |  2 +-
 .../alibaba/dubbo/common/utils/NetUtils.java  | 21 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/support/FailsafeLogger.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/support/FailsafeLogger.java
index 36e08031d..b4a8e90d4 100644
--- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/support/FailsafeLogger.java
+++ b/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) {
diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NetUtils.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NetUtils.java
index f0b82a1bd..c227ace12 100644
--- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NetUtils.java
+++ b/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();
-- 
GitLab