Author: sebb
Date: Sat Feb 2 06:31:12 2008
New Revision: 617804
URL: http://svn.apache.org/viewvc?rev=617804&view=rev
Log:
Add methods to get the local IP and name
Log these during startup
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=617804&r1=617803&r2=617804&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Sat Feb 2
06:31:12 2008
@@ -288,6 +288,9 @@
log.info("JMeterHome=" +
JMeterUtils.getJMeterHome());// $NON-NLS-1$
logProperty("user.dir"," ="); //$NON-NLS-1$
log.info("PWD ="+new
File(".").getCanonicalPath());//$NON-NLS-1$
+ log.info("IP: "+JMeterUtils.getLocalHostIP()
+ +" Name:
"+JMeterUtils.getLocalHostName()
+ +" FullName:
"+JMeterUtils.getLocalHostFullName());
setProxy(parser);
updateClassLoader();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=617804&r1=617803&r2=617804&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Sat
Feb 2 06:31:12 2008
@@ -27,7 +27,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.net.InetAddress;
import java.net.URL;
+import java.net.UnknownHostException;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Iterator;
@@ -77,6 +79,12 @@
private static ResourceBundle resources;
+ // What host am I running on?
+
+ private static String localHostIP = null;
+ private static String localHostName = null;
+ private static String localHostFullName = null;
+
private static ThreadLocal localMatcher = new ThreadLocal() {
protected Object initialValue() {
return new Perl5Matcher();
@@ -1068,5 +1076,39 @@
f=new File(getJMeterBinDir(),fileName);
}
return f;
+ }
+
+ public static synchronized String getLocalHostIP(){
+ if (localHostIP == null) {
+ getLocalHostDetails();
+ }
+ return localHostIP;
+ }
+
+ public static synchronized String getLocalHostName(){
+ if (localHostName == null) {
+ getLocalHostDetails();
+ }
+ return localHostName;
+ }
+
+ public static synchronized String getLocalHostFullName(){
+ if (localHostFullName == null) {
+ getLocalHostDetails();
+ }
+ return localHostFullName;
+ }
+
+ private static void getLocalHostDetails(){
+ InetAddress localHost=null;
+ try {
+ localHost = InetAddress.getLocalHost();
+ } catch (UnknownHostException e1) {
+ log.error("Unable to get local host IP address.");
+ return; // TODO - perhaps this should be a fatal error?
+ }
+ localHostIP=localHost.getHostAddress();
+ localHostName=localHost.getHostName();
+ localHostFullName=localHost.getCanonicalHostName();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
