aboutsummaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
authorGabriel Jackson <gabriel@coffeepowered.co>2017-01-29 12:13:57 -0800
committerKim "BKC" Carlbäcker <kim.carlbacker@gmail.com>2017-02-02 15:24:18 +0100
commitbf6f61cc690978bcad416ace8e8da2418602cbf3 (patch)
tree98be4a5abcd53063b41676772b8dd37a47621c44 /routers
parent73d05a51e3dce4a5b31b8660a6141a14ae615404 (diff)
downloadgitea-bf6f61cc690978bcad416ace8e8da2418602cbf3.tar.gz
gitea-bf6f61cc690978bcad416ace8e8da2418602cbf3.zip
Cleanup log messaging
This change corrects a few logging issues: * Standardized formatting errors with '%v'. * Standardized failure warning word usage. * Corrected an instance of using the standard log library when the gitea log library should be used instead.
Diffstat (limited to 'routers')
-rw-r--r--routers/init.go2
-rw-r--r--routers/install.go2
-rw-r--r--routers/repo/view.go6
3 files changed, 5 insertions, 5 deletions
diff --git a/routers/init.go b/routers/init.go
index 048ded15fe..c56f0be1dd 100644
--- a/routers/init.go
+++ b/routers/init.go
@@ -51,7 +51,7 @@ func GlobalInit() {
highlight.NewContext()
markdown.BuildSanitizer()
if err := models.NewEngine(); err != nil {
- log.Fatal(4, "Fail to initialize ORM engine: %v", err)
+ log.Fatal(4, "Failed to initialize ORM engine: %v", err)
}
models.HasEngine = true
diff --git a/routers/install.go b/routers/install.go
index 080b76d4be..664489570c 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -242,7 +242,7 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) {
if com.IsFile(setting.CustomConf) {
// Keeps custom settings if there is already something.
if err = cfg.Append(setting.CustomConf); err != nil {
- log.Error(4, "Fail to load custom conf '%s': %v", setting.CustomConf, err)
+ log.Error(4, "Failed to load custom conf '%s': %v", setting.CustomConf, err)
}
}
cfg.Section("database").Key("DB_TYPE").SetValue(models.DbCfg.Type)
diff --git a/routers/repo/view.go b/routers/repo/view.go
index b92380d897..0f9def877f 100644
--- a/routers/repo/view.go
+++ b/routers/repo/view.go
@@ -6,10 +6,12 @@ package repo
import (
"bytes"
+ "encoding/base64"
"fmt"
gotemplate "html/template"
"io/ioutil"
"path"
+ "strconv"
"strings"
"code.gitea.io/git"
@@ -22,9 +24,7 @@ import (
"code.gitea.io/gitea/modules/markdown"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/templates"
- "encoding/base64"
"github.com/Unknwon/paginater"
- "strconv"
)
const (
@@ -193,7 +193,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
var fileContent string
if content, err := templates.ToUTF8WithErr(buf); err != nil {
if err != nil {
- log.Error(4, "ToUTF8WithErr: %s", err)
+ log.Error(4, "ToUTF8WithErr: %v", err)
}
fileContent = string(buf)
} else {