From 1ef9c41dc67359b2a8e0865c58250e96c1f56787 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sun, 9 Apr 2023 22:33:14 +0800
Subject: [PATCH] fine tune

---
 modules/assetfs/layered.go  | 6 ++----
 modules/templates/mailer.go | 4 ++--
 modules/util/timer.go       | 5 +++--
 routers/init.go             | 7 -------
 routers/install/setting.go  | 2 +-
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/modules/assetfs/layered.go b/modules/assetfs/layered.go
index 0b5d0f817feb..97576e312a4d 100644
--- a/modules/assetfs/layered.go
+++ b/modules/assetfs/layered.go
@@ -116,8 +116,8 @@ func (l *LayeredFS) ListFiles(name string, fileMode ...bool) ([]string, error) {
 			return nil, err
 		}
 		infos, err := f.Readdir(-1)
+		_ = f.Close()
 		if err != nil {
-			_ = f.Close()
 			return nil, err
 		}
 		for _, info := range infos {
@@ -133,7 +133,6 @@ func (l *LayeredFS) ListFiles(name string, fileMode ...bool) ([]string, error) {
 				fileMap[info.Name()] = true
 			}
 		}
-		_ = f.Close()
 	}
 	var files []string
 	for file := range fileMap {
@@ -164,11 +163,10 @@ func (l *LayeredFS) listAllFiles(layers []*Layer, name string, fileMode ...bool)
 				return err
 			}
 			infos, err := f.Readdir(-1)
+			_ = f.Close()
 			if err != nil {
-				_ = f.Close()
 				return err
 			}
-			_ = f.Close()
 			for _, info := range infos {
 				include := false
 				if len(fileMode) == 0 {
diff --git a/modules/templates/mailer.go b/modules/templates/mailer.go
index dc0045beca74..280ac0e587e2 100644
--- a/modules/templates/mailer.go
+++ b/modules/templates/mailer.go
@@ -70,11 +70,11 @@ func Mailer(ctx context.Context) (*texttmpl.Template, *template.Template) {
 		for _, assetPath := range assetPaths {
 			content, layerName, err := assetFS.ReadLayeredFile(assetPath)
 			if err != nil {
-				log.Warn("Failed to read mail template %s: %v (by %s)", assetPath, err, layerName)
+				log.Warn("Failed to read mail template %s by %s: %v", assetPath, layerName, err)
 				continue
 			}
 			tmplName := strings.TrimPrefix(strings.TrimSuffix(assetPath, ".tmpl"), "mail/")
-			log.Debug("Adding mail template %s: %s (by %s)", tmplName, assetPath, layerName)
+			log.Trace("Adding mail template %s: %s by %s", tmplName, assetPath, layerName)
 			buildSubjectBodyTemplate(subjectTemplates, bodyTemplates, tmplName, content)
 		}
 	}
diff --git a/modules/util/timer.go b/modules/util/timer.go
index 629722246de3..dc039bc0c9ae 100644
--- a/modules/util/timer.go
+++ b/modules/util/timer.go
@@ -34,13 +34,14 @@ func Debounce(d time.Duration) func(f func()) {
 		if db.t != nil {
 			db.t.Stop()
 		}
-		trigger := db.t
-		db.t = time.AfterFunc(d, func() {
+		var trigger *time.Timer
+		trigger = time.AfterFunc(d, func() {
 			db.mu.Lock()
 			defer db.mu.Unlock()
 			if trigger == db.t {
 				f()
 			}
 		})
+		db.t = trigger
 	}
 }
diff --git a/routers/init.go b/routers/init.go
index e143f72e00fb..c539975acadc 100644
--- a/routers/init.go
+++ b/routers/init.go
@@ -71,13 +71,6 @@ func mustInitCtx(ctx context.Context, fn func(ctx context.Context) error) {
 	}
 }
 
-// InitGitServices init new services for git, this is also called in `contrib/pr/checkout.go`
-func InitGitServices() {
-	setting.LoadSettings()
-	mustInit(storage.Init)
-	mustInit(repo_service.Init)
-}
-
 func syncAppConfForGit(ctx context.Context) error {
 	runtimeState := new(system.RuntimeState)
 	if err := system.AppState.Get(runtimeState); err != nil {
diff --git a/routers/install/setting.go b/routers/install/setting.go
index 44806ce46554..dadefa26a293 100644
--- a/routers/install/setting.go
+++ b/routers/install/setting.go
@@ -30,7 +30,7 @@ func PreloadSettings(ctx context.Context) bool {
 		}
 
 		setting.LoadSettingsForInstall()
-		svg.Init()
+		_ = svg.Init()
 	}
 
 	return !setting.InstallLock