From 13a8823bd33e769565c0b505d9bb26f073c7e243 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 27 Aug 2016 12:25:22 -0700 Subject: [PATCH] #3495 only start builtin SSH server after user finish installation --- README.md | 2 +- gogs.go | 2 +- routers/install.go | 13 ++++++------- templates/.VERSION | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 8075d4020..cfaaf0720 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) -##### Current tip version: 0.9.87 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions) +##### Current tip version: 0.9.88 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions) | Web | UI | Preview | |:-------------:|:-------:|:-------:| diff --git a/gogs.go b/gogs.go index d9601ece9..25a277db9 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.9.87.0826" +const APP_VER = "0.9.88.0827" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/routers/install.go b/routers/install.go index 54a98edcd..9ab0a4596 100644 --- a/routers/install.go +++ b/routers/install.go @@ -57,21 +57,23 @@ func NewServices() { // GlobalInit is for global configuration reload-able. func GlobalInit() { setting.NewContext() - highlight.NewContext() log.Trace("Custom path: %s", setting.CustomPath) log.Trace("Log path: %s", setting.LogRootPath) models.LoadConfigs() NewServices() if setting.InstallLock { + highlight.NewContext() + markdown.BuildSanitizer() + models.LoadRepoConfig() models.NewRepoContext() - if err := models.NewEngine(); err != nil { log.Fatal(4, "Fail to initialize ORM engine: %v", err) } - models.HasEngine = true + + // Booting long running goroutines. cron.NewContext() models.InitDeliverHooks() models.InitTestPullRequests() @@ -88,13 +90,10 @@ func GlobalInit() { } checkRunMode() - if setting.SSH.StartBuiltinServer { + if setting.InstallLock && setting.SSH.StartBuiltinServer { ssh.Listen(setting.SSH.ListenPort) log.Info("SSH server started on :%v", setting.SSH.ListenPort) } - - // Build Sanitizer - markdown.BuildSanitizer() } func InstallInit(ctx *context.Context) { diff --git a/templates/.VERSION b/templates/.VERSION index 0337cf7ae..a3ab1840a 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.87.0826 \ No newline at end of file +0.9.88.0827 \ No newline at end of file