The Unified and Autonomous Development Platform
Fix issue #649 - OneDev server killed if running in console mode upon git prompting for password
Robin Shen0ad0fc1dedde
diff --git a/pom.xml b/pom.xmlindex 4aeda39639..7ae339c52c 100644--- a/pom.xml+++ b/pom.xml@@ -564,7 +564,7 @@</repositories><properties><commons.version>2.1.1</commons.version>- <agent.version>1.2.14</agent.version>+ <agent.version>1.2.15</agent.version><slf4j.version>1.7.30</slf4j.version><logback.version>1.2.0</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.javaindex aa1efde435..5fb467b16d 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java@@ -525,6 +525,9 @@ public class Upgrade extends DefaultPersistManager {"io.onedev.commons.bootstrap.Bootstrap");wrapperConf = StringUtils.replace(wrapperConf, "wrapper.pidfile=../status/onedev.pid", "");+ if (!wrapperConf.contains("wrapper.disable_console_input"))+ wrapperConf += "\r\nwrapper.disable_console_input=TRUE";+FileUtils.writeStringToFile(wrapperConfFile, wrapperConf, StandardCharsets.UTF_8);File hibernatePropsFile = new File(upgradeDir, "conf/hibernate.properties");diff --git a/server-product/jsw/wrapper.conf b/server-product/jsw/wrapper.confindex 2ae3485174..9175a10925 100644--- a/server-product/jsw/wrapper.conf+++ b/server-product/jsw/wrapper.conf@@ -129,6 +129,7 @@ wrapper.ignore_sequence_gaps=TRUE# Title to use when running as a console+wrapper.disable_console_input=TRUE#********************************************************************# Wrapper Windows NT/2000/XP Service Properties