Skip to content

Commit

Permalink
Print usefull error if SQLite is used in settings but not supported (#…
Browse files Browse the repository at this point in the history
…14476)

* move log output to points where they are relefant

* check explicit of sqlite3 in settings
  • Loading branch information
6543 authored Jan 27, 2021
1 parent 5845c87 commit b2c20b6
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions routers/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ func GlobalInit(ctx context.Context) {
if !setting.InstallLock {
log.Fatal("Gitea is not installed")
}

if err := git.Init(ctx); err != nil {
log.Fatal("Git module init failed: %v", err)
}
Expand All @@ -134,6 +135,7 @@ func GlobalInit(ctx context.Context) {
log.Trace("AppWorkPath: %s", setting.AppWorkPath)
log.Trace("Custom path: %s", setting.CustomPath)
log.Trace("Log path: %s", setting.LogRootPath)
checkRunMode()

// Setup i18n
translation.InitLocales()
Expand All @@ -143,6 +145,12 @@ func GlobalInit(ctx context.Context) {
highlight.NewContext()
external.RegisterParsers()
markup.Init()

if setting.EnableSQLite3 {
log.Info("SQLite3 Supported")
} else if setting.Database.UseSQLite3 {
log.Fatal("SQLite3 is set in settings but NOT Supported")
}
if err := initDBEngine(ctx); err == nil {
log.Info("ORM engine initialization successful!")
} else {
Expand Down Expand Up @@ -175,11 +183,6 @@ func GlobalInit(ctx context.Context) {
}
eventsource.GetManager().Init()

if setting.EnableSQLite3 {
log.Info("SQLite3 Supported")
}
checkRunMode()

if setting.SSH.StartBuiltinServer {
ssh.Listen(setting.SSH.ListenHost, setting.SSH.ListenPort, setting.SSH.ServerCiphers, setting.SSH.ServerKeyExchanges, setting.SSH.ServerMACs)
log.Info("SSH server started on %s:%d. Cipher list (%v), key exchange algorithms (%v), MACs (%v)", setting.SSH.ListenHost, setting.SSH.ListenPort, setting.SSH.ServerCiphers, setting.SSH.ServerKeyExchanges, setting.SSH.ServerMACs)
Expand Down

0 comments on commit b2c20b6

Please sign in to comment.