zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed startup with no local address

Browse source
This commit is contained in:
anhefti 2022-06-01 15:39:12 +02:00
parent 025ee79561
commit 10727e398c
2 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java
View file

@ -201,7 +201,8 @@ public class WebserviceInfo {
try { try {
return InetAddress.getLocalHost().getHostName(); return InetAddress.getLocalHost().getHostName();
} catch (final UnknownHostException e) { } catch (final UnknownHostException e) {
return null; log.error("Failed to get local host name: {}", e.getMessage());
return Constants.EMPTY_NOTE;
} }
} }
@ -209,7 +210,8 @@ public class WebserviceInfo {
try { try {
return InetAddress.getLocalHost().getHostAddress(); return InetAddress.getLocalHost().getHostAddress();
} catch (final UnknownHostException e) { } catch (final UnknownHostException e) {
return null; log.error("Failed to get local host address: {}", e.getMessage());
return Constants.EMPTY_NOTE;
} }
} }

19
src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInit.java
View file

@ -8,9 +8,6 @@
package ch.ethz.seb.sebserver.webservice; package ch.ethz.seb.sebserver.webservice;
import java.net.InetAddress;
import java.net.UnknownHostException;
import javax.annotation.PreDestroy; import javax.annotation.PreDestroy;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@ -126,21 +123,15 @@ public class WebserviceInit implements ApplicationListener<ApplicationReadyEvent
this.environment.getProperty("sebserver.webservice.distributed.connectionUpdate", "2000")); this.environment.getProperty("sebserver.webservice.distributed.connectionUpdate", "2000"));
} }
try {
SEBServerInit.INIT_LOGGER.info("----> "); SEBServerInit.INIT_LOGGER.info("----> ");
SEBServerInit.INIT_LOGGER.info("----> Server address: {}", this.environment.getProperty("server.address")); SEBServerInit.INIT_LOGGER.info("----> Server address: {}", this.environment.getProperty("server.address"));
SEBServerInit.INIT_LOGGER.info("----> Server port: {}", this.environment.getProperty("server.port")); SEBServerInit.INIT_LOGGER.info("----> Server port: {}", this.environment.getProperty("server.port"));
SEBServerInit.INIT_LOGGER.info("---->"); SEBServerInit.INIT_LOGGER.info("---->");
SEBServerInit.INIT_LOGGER.info("----> Local-Host address: {}", InetAddress.getLocalHost().getHostAddress()); SEBServerInit.INIT_LOGGER.info("----> Local-Host address: {}", this.webserviceInfo.getLocalHostAddress());
SEBServerInit.INIT_LOGGER.info("----> Local-Host name: {}", InetAddress.getLocalHost().getHostName()); SEBServerInit.INIT_LOGGER.info("----> Local-Host name: {}", this.webserviceInfo.getLocalHostName());
SEBServerInit.INIT_LOGGER.info("---->"); SEBServerInit.INIT_LOGGER.info("---->");
SEBServerInit.INIT_LOGGER.info("----> Remote-Host address: {}", SEBServerInit.INIT_LOGGER.info("----> Remote-Host address: {}", this.webserviceInfo.getLoopbackHostAddress());
InetAddress.getLoopbackAddress().getHostAddress()); SEBServerInit.INIT_LOGGER.info("----> Remote-Host name: {}", this.webserviceInfo.getLoopbackHostName());
SEBServerInit.INIT_LOGGER.info("----> Remote-Host name: {}",
InetAddress.getLoopbackAddress().getHostName());
} catch (final UnknownHostException e) {
SEBServerInit.INIT_LOGGER.error("Unknown Host: ", e);
}
SEBServerInit.INIT_LOGGER.info("---->"); SEBServerInit.INIT_LOGGER.info("---->");
SEBServerInit.INIT_LOGGER.info("----> Context Path: {}", this.webserviceInfo.getContextPath()); SEBServerInit.INIT_LOGGER.info("----> Context Path: {}", this.webserviceInfo.getContextPath());
@ -162,7 +153,7 @@ public class WebserviceInit implements ApplicationListener<ApplicationReadyEvent
boolean registered = false; boolean registered = false;
try { try {
final String webserviceUUID = this.webserviceInfo.getWebserviceUUID(); final String webserviceUUID = this.webserviceInfo.getWebserviceUUID();
final String hostAddress = InetAddress.getLocalHost().getHostAddress(); final String hostAddress = this.webserviceInfo.getLocalHostAddress();
registered = this.webserviceInfoDAO.register(webserviceUUID, hostAddress); registered = this.webserviceInfoDAO.register(webserviceUUID, hostAddress);
if (registered) { if (registered) {
SEBServerInit.INIT_LOGGER.info("----> Successfully register Webservice instance. uuid: {}, address: {}", SEBServerInit.INIT_LOGGER.info("----> Successfully register Webservice instance. uuid: {}, address: {}",