Use mount but not register for chi routes (#13555)

* Use mount but not register for chi routes

* Fix test

* Fix test

* Fix test

* Fix comment

* turn back unnecessary change

* Remove the timout middleware since some operations may spend much time.
This commit is contained in:
Lunny Xiao 2020-11-16 15:33:41 +08:00 committed by GitHub
parent 8c2b5feeae
commit 586bfb9f32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 16 deletions

View file

@ -58,18 +58,20 @@ func Install(ctx *context.Context) {
form.DbSchema = setting.Database.Schema
form.Charset = setting.Database.Charset
ctx.Data["CurDbOption"] = "MySQL"
var curDBOption = "MySQL"
switch setting.Database.Type {
case "postgres":
ctx.Data["CurDbOption"] = "PostgreSQL"
curDBOption = "PostgreSQL"
case "mssql":
ctx.Data["CurDbOption"] = "MSSQL"
curDBOption = "MSSQL"
case "sqlite3":
if setting.EnableSQLite3 {
ctx.Data["CurDbOption"] = "SQLite3"
curDBOption = "SQLite3"
}
}
ctx.Data["CurDbOption"] = curDBOption
// Application general settings
form.AppName = setting.AppName
form.RepoRootPath = setting.RepoRootPath