Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-09 06:55:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #331

Browse Source
This commit is contained in:
takezoe
2014-04-01 04:47:08 +09:00
parent 5d3365a944
commit 6227a4643a
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/app/SystemSettingsController.scala
View File

@@ -55,6 +55,10 @@ trait SystemSettingsControllerBase extends ControllerBase {
post("/admin/system", form)(adminOnly { form => post("/admin/system", form)(adminOnly { form =>
saveSystemSettings(form) saveSystemSettings(form)
if(form.ssh && SshServer.isActive && context.settings.sshPort != form.sshPort){
SshServer.stop()
}
if(form.ssh && !SshServer.isActive && form.baseUrl.isDefined){ if(form.ssh && !SshServer.isActive && form.baseUrl.isDefined){
SshServer.start(request.getServletContext, SshServer.start(request.getServletContext,
form.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), form.sshPort.getOrElse(SystemSettingsService.DefaultSshPort),

1
src/main/scala/ssh/SshServerListener.scala
View File

@@ -31,6 +31,7 @@ object SshServer {
def stop() = { def stop() = {
if(active.compareAndSet(true, false)){ if(active.compareAndSet(true, false)){
server.stop(true) server.stop(true)
logger.info("SSH Server is stopped.")
} }
} }