Skip to content

The Unified and Autonomous Development Platform

Preserve FILES_TO_SOURCE in server.sh while upgrading

Robin Shen02629fee0cd4
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
index f80c527d8c..9a4f896ac9 100644
--- a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
+++ b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
@@ -423,6 +423,8 @@ public class Upgrade extends AbstractPlugin {
try {
String serverScript = null;
if (file.getName().equals("server.sh")) {
+ serverScript = FileUtils.readFileToString(file, Charset.defaultCharset());
+
String siteRunAsUserLine = null;
for (String line: (List<String>)FileUtils.readLines(siteServerScriptFile, Charset.defaultCharset())) {
if (line.contains("RUN_AS_USER")) {
@@ -431,17 +433,34 @@ public class Upgrade extends AbstractPlugin {
}
}
if (siteRunAsUserLine != null) {
- String newRunAsUserLine = null;
+ String runAsUserLine = null;
for (String line: (List<String>)FileUtils.readLines(file, Charset.defaultCharset())) {
if (line.contains("RUN_AS_USER")) {
- newRunAsUserLine = line;
+ runAsUserLine = line;
break;
}
}
- if (newRunAsUserLine != null) {
- serverScript = FileUtils.readFileToString(file, Charset.defaultCharset());
- serverScript = StringUtils.replace(serverScript, newRunAsUserLine, siteRunAsUserLine);
+ if (runAsUserLine != null)
+ serverScript = StringUtils.replace(serverScript, runAsUserLine, siteRunAsUserLine);
+ }
+
+ String siteFilesToSourceLine = null;
+ for (String line: (List<String>)FileUtils.readLines(siteServerScriptFile, Charset.defaultCharset())) {
+ if (line.contains("FILES_TO_SOURCE") && !line.startsWith("#")) {
+ siteFilesToSourceLine = line;
+ break;
+ }
+ }
+ if (siteFilesToSourceLine != null) {
+ String filesToSourceLine = null;
+ for (String line: (List<String>)FileUtils.readLines(file, Charset.defaultCharset())) {
+ if (line.contains("FILES_TO_SOURCE") && !line.startsWith("#")) {
+ filesToSourceLine = line;
+ break;
+ }
}
+ if (filesToSourceLine != null)
+ serverScript = StringUtils.replace(serverScript, filesToSourceLine, siteFilesToSourceLine);
}
}
if (serverScript != null)
diff --git a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java
index f11ea71131..fc4094fbb4 100644
--- a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java
+++ b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java
@@ -126,7 +126,10 @@ public class DefaultServerConfig implements ServerConfig {
String clusterPortStr = System.getenv(PROP_CLUSTER_PORT);
if (StringUtils.isBlank(clusterPortStr))
clusterPortStr = props.getProperty(PROP_CLUSTER_PORT);
- clusterPort = Integer.parseInt(clusterPortStr.trim());
+ if (StringUtils.isBlank(clusterPortStr))
+ clusterPort = 5701;
+ else
+ clusterPort = Integer.parseInt(clusterPortStr.trim());
HardwareAbstractionLayer hardware = null;
try {