From 6ed7f269f198b5a57e5bc7eca6ddec4980417899 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 24 Nov 2016 15:40:16 +0800 Subject: [PATCH] Move init functions from routers/install to routers/init (#230) * move init functions from routers/install to routers/init * copyright typo --- routers/init.go | 82 ++++++++++++++++++++++++++++++++++++++++++++++ routers/install.go | 69 -------------------------------------- 2 files changed, 82 insertions(+), 69 deletions(-) create mode 100644 routers/init.go diff --git a/routers/init.go b/routers/init.go new file mode 100644 index 000000000..07f84a25f --- /dev/null +++ b/routers/init.go @@ -0,0 +1,82 @@ +// Copyright 2016 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package routers + +import ( + "path" + "strings" + + "code.gitea.io/git" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/cron" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/mailer" + "code.gitea.io/gitea/modules/markdown" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/ssh" + "code.gitea.io/gitea/modules/template/highlight" + macaron "gopkg.in/macaron.v1" +) + +func checkRunMode() { + switch setting.Cfg.Section("").Key("RUN_MODE").String() { + case "prod": + macaron.Env = macaron.PROD + macaron.ColorLog = false + setting.ProdMode = true + default: + git.Debug = true + } + log.Info("Run Mode: %s", strings.Title(macaron.Env)) +} + +// NewServices init new services +func NewServices() { + setting.NewServices() + mailer.NewContext() +} + +// GlobalInit is for global configuration reload-able. +func GlobalInit() { + setting.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() + if err := models.NewEngine(); err != nil { + log.Fatal(4, "Fail to initialize ORM engine: %v", err) + } + models.HasEngine = true + + models.LoadRepoConfig() + models.NewRepoContext() + + // Booting long running goroutines. + cron.NewContext() + models.InitSyncMirrors() + models.InitDeliverHooks() + models.InitTestPullRequests() + log.NewGitLogger(path.Join(setting.LogRootPath, "http.log")) + } + if models.EnableSQLite3 { + log.Info("SQLite3 Supported") + } + if models.EnableTiDB { + log.Info("TiDB Supported") + } + if setting.SupportMiniWinService { + log.Info("Builtin Windows Service Supported") + } + checkRunMode() + + if setting.InstallLock && setting.SSH.StartBuiltinServer { + ssh.Listen(setting.SSH.ListenPort) + log.Info("SSH server started on :%v", setting.SSH.ListenPort) + } +} diff --git a/routers/install.go b/routers/install.go index 5cc213644..ab9c83550 100644 --- a/routers/install.go +++ b/routers/install.go @@ -15,21 +15,13 @@ import ( "github.com/Unknwon/com" "github.com/go-xorm/xorm" "gopkg.in/ini.v1" - "gopkg.in/macaron.v1" - - "code.gitea.io/git" "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/auth" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/modules/cron" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/mailer" - "code.gitea.io/gitea/modules/markdown" "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/ssh" - "code.gitea.io/gitea/modules/template/highlight" "code.gitea.io/gitea/modules/user" ) @@ -38,67 +30,6 @@ const ( tplInstall base.TplName = "install" ) -func checkRunMode() { - switch setting.Cfg.Section("").Key("RUN_MODE").String() { - case "prod": - macaron.Env = macaron.PROD - macaron.ColorLog = false - setting.ProdMode = true - default: - git.Debug = true - } - log.Info("Run Mode: %s", strings.Title(macaron.Env)) -} - -// NewServices init new services -func NewServices() { - setting.NewServices() - mailer.NewContext() -} - -// GlobalInit is for global configuration reload-able. -func GlobalInit() { - setting.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() - if err := models.NewEngine(); err != nil { - log.Fatal(4, "Fail to initialize ORM engine: %v", err) - } - models.HasEngine = true - - models.LoadRepoConfig() - models.NewRepoContext() - - // Booting long running goroutines. - cron.NewContext() - models.InitSyncMirrors() - models.InitDeliverHooks() - models.InitTestPullRequests() - log.NewGitLogger(path.Join(setting.LogRootPath, "http.log")) - } - if models.EnableSQLite3 { - log.Info("SQLite3 Supported") - } - if models.EnableTiDB { - log.Info("TiDB Supported") - } - if setting.SupportMiniWinService { - log.Info("Builtin Windows Service Supported") - } - checkRunMode() - - if setting.InstallLock && setting.SSH.StartBuiltinServer { - ssh.Listen(setting.SSH.ListenPort) - log.Info("SSH server started on :%v", setting.SSH.ListenPort) - } -} - // InstallInit prepare for rendering installation page func InstallInit(ctx *context.Context) { if setting.InstallLock {