archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-08 18:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix issue #649 - OneDev server killed if running in console mode upon git prompting for password

Browse Source
This commit is contained in:
Robin Shen 2022-03-24 16:33:32 +08:00
parent 09b4e11cc0
commit 0ad0fc1ded
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -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>

3
server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java
View File

@ -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");

1
server-product/jsw/wrapper.conf
View File

@ -129,6 +129,7 @@ wrapper.ignore_sequence_gaps=TRUE
# Title to use when running as a console
wrapper.console.title=@app.long.name@
wrapper.disable_console_input=TRUE
#********************************************************************
# Wrapper Windows NT/2000/XP Service Properties