mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-02 22:05:44 +02:00
Code Issues Wiki Activity

[448400] [dstore] automatically fallback to exec(hostname) if no

Browse source 
hostname detected and print message if needed
This commit is contained in:
Dave McKnight 2014-10-22 12:19:12 -04:00
parent dfe1ef4d5a
commit d6a3c90c95
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerAttributes.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2002, 2012 IBM Corporation and others. * Copyright (c) 2002, 2014 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -14,6 +14,7 @@
* Contributors: * Contributors:
* David McKnight (IBM) - [283613] [dstore] Create a Constants File for all System Properties we support * David McKnight (IBM) - [283613] [dstore] Create a Constants File for all System Properties we support
* David McKnight (IBM) - [388472] [dstore] need alternative option for getting at server hostname * David McKnight (IBM) - [388472] [dstore] need alternative option for getting at server hostname
* David McKnight (IBM) - [448400] [dstore] automatically fallback to exec(hostname) if no hostname detected and print message if needed
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dstore.internal.core.server; package org.eclipse.dstore.internal.core.server;
@ -93,8 +94,26 @@ public class ServerAttributes extends DataStoreAttributes
} catch (UnknownHostException e) { } catch (UnknownHostException e) {
} }
} }
// set this so we don't have to do it again if (hostname == null){
System.setProperty("hostname", hostname); //$NON-NLS-1$ // fall back to reading hostname from shell
try {
Process p = Runtime.getRuntime().exec("hostname"); //$NON-NLS-1$
InputStream inStream = p.getInputStream();
BufferedReader reader = new BufferedReader(new InputStreamReader(inStream));
hostname = reader.readLine();
} catch (IOException e) {
}
}
if (hostname != null && hostname.length() > 0){
// set this so we don't have to do it again
System.setProperty("hostname", hostname); //$NON-NLS-1$
}
else {
System.err.println("The server can not resolve the hostname. There may be a problem with the host DNS settings. This can be worked around by using the following JVM option with the server: -Dhostname=<hostname>");
hostname ="";
}
} }
return hostname; return hostname;
} }