From e683b65477d1e3edaef809de52be158294d075e9 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 26 Jan 2021 20:14:24 +0100
Subject: [PATCH 1/2] move log output to points where they are relefant

---
 routers/init.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/routers/init.go b/routers/init.go
index 9d13bc9ed59a..efc46aaee49c 100644
--- a/routers/init.go
+++ b/routers/init.go
@@ -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)
 	}
@@ -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()
@@ -143,6 +145,10 @@ func GlobalInit(ctx context.Context) {
 	highlight.NewContext()
 	external.RegisterParsers()
 	markup.Init()
+
+	if setting.EnableSQLite3 {
+		log.Info("SQLite3 Supported")
+	}
 	if err := initDBEngine(ctx); err == nil {
 		log.Info("ORM engine initialization successful!")
 	} else {
@@ -175,11 +181,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)

From 5f25913d440d529cbb0009c8c9bb7e4f1d0053df Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 26 Jan 2021 20:20:09 +0100
Subject: [PATCH 2/2] check explicit of sqlite3 in settings

---
 routers/init.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/routers/init.go b/routers/init.go
index efc46aaee49c..f5dbfc87d272 100644
--- a/routers/init.go
+++ b/routers/init.go
@@ -148,6 +148,8 @@ func GlobalInit(ctx context.Context) {
 
 	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!")