Skip to content

The Unified and Autonomous Development Platform

Avoid cluttering logs when InetAddress.getLocalHost() does not work

Robin Shenb19c4a664cff
diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.java
index e6b7029a92..fb45680b88 100644
--- a/server-core/src/main/java/io/onedev/server/OneDev.java
+++ b/server-core/src/main/java/io/onedev/server/OneDev.java
@@ -248,7 +248,7 @@ public class OneDev extends AbstractPlugin implements Serializable {
try {
host = InetAddress.getLocalHost().getHostName();
} catch (UnknownHostException e2) {
- throw new RuntimeException(e2);
+ host = "localhost";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
index c53ef9972a..8b170920c2 100644
--- a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
@@ -101,7 +101,7 @@ public class DefaultMailManager implements MailManager {
try {
hostName = InetAddress.getLocalHost().getHostName();
} catch (UnknownHostException e) {
- throw new RuntimeException(e);
+ hostName = "localhost";
}
senderEmail = "onedev@" + hostName;
}
diff --git a/server-product/jsw/wrapper.conf b/server-product/jsw/wrapper.conf
index a5feb3b9ad..28f1886f83 100644
--- a/server-product/jsw/wrapper.conf
+++ b/server-product/jsw/wrapper.conf
@@ -58,7 +58,9 @@ wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
-wrapper.java.classpath.1=*.jar
+wrapper.java.classpath.1=io.onedev.*.jar
+wrapper.java.classpath.2=*.jar
+
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=.
diff --git a/server-product/system/conf/logback.xml b/server-product/system/conf/logback.xml
index aa2905f960..1fe432548b 100644
--- a/server-product/system/conf/logback.xml
+++ b/server-product/system/conf/logback.xml
@@ -44,6 +44,8 @@
<logger name="org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator" level="ERROR"/>
<logger name="io.onedev" level="INFO"/>
+ <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+
<root level="WARN">
<appender-ref ref="FILE"/>
<appender-ref ref="CONSOLE"/>