modify hostname handling

src/main/java/org/codelibs/fess/exec/Crawler.java

@@ -18,7 +18,6 @@ package org.codelibs.fess.exec;
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
-import java.net.InetAddress;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -278,15 +277,7 @@ public class Crawler implements Serializable {
                 dataMap.put(StringUtil.decapitalize(entry.getKey()), entry.getValue());
             }
 
-            try {
-                dataMap.put("hostname", InetAddress.getLocalHost().toString());
-            } catch (final Exception e1) {
-                try {
-                    dataMap.put("hostname", InetAddress.getLocalHost().getHostAddress());
-                } catch (final Exception e2) {
-                    dataMap.put("hostname", "Unknown");
-                }
-            }
+            dataMap.put("hostname", ComponentUtil.getSystemHelper().getHostname());
 
             logger.debug("\ninfoMap: {}\ndataMap: {}", infoMap, dataMap);
 

src/main/java/org/codelibs/fess/helper/SystemHelper.java

@@ -281,4 +281,14 @@ public class SystemHelper implements Serializable {
         shutdownHookList.add(hook);
     }
 
+    public String getHostname() {
+        Map<String, String> env = System.getenv();
+        if (env.containsKey("COMPUTERNAME"))
+            return env.get("COMPUTERNAME");
+        else if (env.containsKey("HOSTNAME"))
+            return env.get("HOSTNAME");
+        else
+            return "Unknown";
+    }
+
 }