aboutsummaryrefslogtreecommitdiff
path: root/internal/route
diff options
context:
space:
mode:
Diffstat (limited to 'internal/route')
-rw-r--r--internal/route/admin/auths.go2
-rw-r--r--internal/route/admin/notice.go2
-rw-r--r--internal/route/admin/repos.go2
-rw-r--r--internal/route/admin/users.go2
-rw-r--r--internal/route/api/v1/admin/user.go12
-rw-r--r--internal/route/api/v1/repo/repo.go10
-rw-r--r--internal/route/install.go21
-rw-r--r--internal/route/org/members.go4
-rw-r--r--internal/route/org/org.go2
-rw-r--r--internal/route/org/setting.go6
-rw-r--r--internal/route/org/teams.go6
-rw-r--r--internal/route/repo/branch.go8
-rw-r--r--internal/route/repo/editor.go10
-rw-r--r--internal/route/repo/http.go8
-rw-r--r--internal/route/repo/issue.go4
-rw-r--r--internal/route/repo/pull.go6
-rw-r--r--internal/route/repo/release.go2
-rw-r--r--internal/route/repo/repo.go6
-rw-r--r--internal/route/repo/setting.go6
-rw-r--r--internal/route/repo/view.go6
-rw-r--r--internal/route/user/auth.go10
-rw-r--r--internal/route/user/setting.go6
22 files changed, 71 insertions, 70 deletions
diff --git a/internal/route/admin/auths.go b/internal/route/admin/auths.go
index 67221542..378c4eee 100644
--- a/internal/route/admin/auths.go
+++ b/internal/route/admin/auths.go
@@ -10,7 +10,7 @@ import (
"strings"
"github.com/unknwon/com"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"xorm.io/core"
"gogs.io/gogs/internal/auth/ldap"
diff --git a/internal/route/admin/notice.go b/internal/route/admin/notice.go
index 9a2514ca..6c591fb0 100644
--- a/internal/route/admin/notice.go
+++ b/internal/route/admin/notice.go
@@ -7,7 +7,7 @@ package admin
import (
"github.com/unknwon/com"
"github.com/unknwon/paginater"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
diff --git a/internal/route/admin/repos.go b/internal/route/admin/repos.go
index c5f3469d..97f4692b 100644
--- a/internal/route/admin/repos.go
+++ b/internal/route/admin/repos.go
@@ -6,7 +6,7 @@ package admin
import (
"github.com/unknwon/paginater"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
diff --git a/internal/route/admin/users.go b/internal/route/admin/users.go
index ff241463..4df40e7e 100644
--- a/internal/route/admin/users.go
+++ b/internal/route/admin/users.go
@@ -8,7 +8,7 @@ import (
"strings"
"github.com/unknwon/com"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
diff --git a/internal/route/api/v1/admin/user.go b/internal/route/api/v1/admin/user.go
index 5e291df2..d159e6d7 100644
--- a/internal/route/api/v1/admin/user.go
+++ b/internal/route/api/v1/admin/user.go
@@ -5,10 +5,9 @@
package admin
import (
- user2 "gogs.io/gogs/internal/route/api/v1/user"
"net/http"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
api "github.com/gogs/go-gogs-client"
@@ -16,6 +15,7 @@ import (
"gogs.io/gogs/internal/db"
"gogs.io/gogs/internal/db/errors"
"gogs.io/gogs/internal/mailer"
+ "gogs.io/gogs/internal/route/api/v1/user"
"gogs.io/gogs/internal/setting"
)
@@ -76,7 +76,7 @@ func CreateUser(c *context.APIContext, form api.CreateUserOption) {
}
func EditUser(c *context.APIContext, form api.EditUserOption) {
- u := user2.GetUserByParams(c)
+ u := user.GetUserByParams(c)
if c.Written() {
return
}
@@ -131,7 +131,7 @@ func EditUser(c *context.APIContext, form api.EditUserOption) {
}
func DeleteUser(c *context.APIContext) {
- u := user2.GetUserByParams(c)
+ u := user.GetUserByParams(c)
if c.Written() {
return
}
@@ -151,9 +151,9 @@ func DeleteUser(c *context.APIContext) {
}
func CreatePublicKey(c *context.APIContext, form api.CreateKeyOption) {
- u := user2.GetUserByParams(c)
+ u := user.GetUserByParams(c)
if c.Written() {
return
}
- user2.CreateUserPublicKey(c, form, u.ID)
+ user.CreateUserPublicKey(c, form, u.ID)
}
diff --git a/internal/route/api/v1/repo/repo.go b/internal/route/api/v1/repo/repo.go
index 096096fb..6950ce9b 100644
--- a/internal/route/api/v1/repo/repo.go
+++ b/internal/route/api/v1/repo/repo.go
@@ -6,11 +6,10 @@ package repo
import (
"fmt"
- convert2 "gogs.io/gogs/internal/route/api/v1/convert"
"net/http"
"path"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
api "github.com/gogs/go-gogs-client"
@@ -18,6 +17,7 @@ import (
"gogs.io/gogs/internal/db"
"gogs.io/gogs/internal/db/errors"
"gogs.io/gogs/internal/form"
+ "gogs.io/gogs/internal/route/api/v1/convert"
"gogs.io/gogs/internal/setting"
)
@@ -25,7 +25,7 @@ func Search(c *context.APIContext) {
opts := &db.SearchRepoOptions{
Keyword: path.Base(c.Query("q")),
OwnerID: c.QueryInt64("uid"),
- PageSize: convert2.ToCorrectPageSize(c.QueryInt("limit")),
+ PageSize: convert.ToCorrectPageSize(c.QueryInt("limit")),
Page: c.QueryInt("page"),
}
@@ -173,7 +173,7 @@ func CreateUserRepo(c *context.APIContext, owner *db.User, opt api.CreateRepoOpt
} else {
if repo != nil {
if err = db.DeleteRepository(c.User.ID, repo.ID); err != nil {
- log.Error(2, "DeleteRepository: %v", err)
+ log.Error("DeleteRepository: %v", err)
}
}
c.ServerError("CreateRepository", err)
@@ -270,7 +270,7 @@ func Migrate(c *context.APIContext, f form.MigrateRepo) {
if err != nil {
if repo != nil {
if errDelete := db.DeleteRepository(ctxUser.ID, repo.ID); errDelete != nil {
- log.Error(2, "DeleteRepository: %v", errDelete)
+ log.Error("DeleteRepository: %v", errDelete)
}
}
diff --git a/internal/route/install.go b/internal/route/install.go
index 4f66a227..bd51711e 100644
--- a/internal/route/install.go
+++ b/internal/route/install.go
@@ -12,9 +12,9 @@ import (
"strings"
"github.com/unknwon/com"
- log "gopkg.in/clog.v1"
"gopkg.in/ini.v1"
"gopkg.in/macaron.v1"
+ log "unknwon.dev/clog/v2"
"xorm.io/xorm"
"github.com/gogs/git-module"
@@ -46,24 +46,25 @@ func checkRunMode() {
log.Info("Run mode: %s", strings.Title(macaron.Env))
}
-func NewServices() {
- setting.NewServices()
- mailer.NewContext()
-}
-
// GlobalInit is for global configuration reload-able.
func GlobalInit() {
- setting.NewContext()
+ setting.Init()
+ setting.InitLogging()
+ log.Info("%s %s", setting.AppName, setting.AppVersion)
log.Trace("Custom path: %s", setting.CustomPath)
log.Trace("Log path: %s", setting.LogRootPath)
+ log.Trace("Build time: %s", setting.BuildTime)
+ log.Trace("Build commit: %s", setting.BuildCommit)
+
db.LoadConfigs()
- NewServices()
+ setting.NewServices()
+ mailer.NewContext()
if setting.InstallLock {
highlight.NewContext()
markup.NewSanitizer()
if err := db.NewEngine(); err != nil {
- log.Fatal(2, "Fail to initialize ORM engine: %v", err)
+ log.Fatal("Failed to initialize ORM engine: %v", err)
}
db.HasEngine = true
@@ -302,7 +303,7 @@ func InstallPost(c *context.Context, f form.Install) {
if com.IsFile(setting.CustomConf) {
// Keeps custom settings if there is already something.
if err := cfg.Append(setting.CustomConf); err != nil {
- log.Error(2, "Fail to load custom conf '%s': %v", setting.CustomConf, err)
+ log.Error("Failed to load custom conf '%s': %v", setting.CustomConf, err)
}
}
cfg.Section("database").Key("DB_TYPE").SetValue(db.DbCfg.Type)
diff --git a/internal/route/org/members.go b/internal/route/org/members.go
index fa156b19..fc36bde1 100644
--- a/internal/route/org/members.go
+++ b/internal/route/org/members.go
@@ -6,7 +6,7 @@ package org
import (
"github.com/unknwon/com"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
@@ -76,7 +76,7 @@ func MembersAction(c *context.Context) {
}
if err != nil {
- log.Error(4, "Action(%s): %v", c.Params(":action"), err)
+ log.Error("Action(%s): %v", c.Params(":action"), err)
c.JSON(200, map[string]interface{}{
"ok": false,
"err": err.Error(),
diff --git a/internal/route/org/org.go b/internal/route/org/org.go
index f3f70ac8..13ec7a51 100644
--- a/internal/route/org/org.go
+++ b/internal/route/org/org.go
@@ -5,7 +5,7 @@
package org
import (
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
diff --git a/internal/route/org/setting.go b/internal/route/org/setting.go
index ab1dd7ff..366a0f6b 100644
--- a/internal/route/org/setting.go
+++ b/internal/route/org/setting.go
@@ -5,15 +5,15 @@
package org
import (
- user2 "gogs.io/gogs/internal/route/user"
"strings"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
"gogs.io/gogs/internal/db/errors"
"gogs.io/gogs/internal/form"
+ "gogs.io/gogs/internal/route/user"
"gogs.io/gogs/internal/setting"
)
@@ -89,7 +89,7 @@ func SettingsPost(c *context.Context, f form.UpdateOrgSetting) {
func SettingsAvatar(c *context.Context, f form.Avatar) {
f.Source = form.AVATAR_LOCAL
- if err := user2.UpdateAvatarSetting(c, f, c.Org.Organization); err != nil {
+ if err := user.UpdateAvatarSetting(c, f, c.Org.Organization); err != nil {
c.Flash.Error(err.Error())
} else {
c.Flash.Success(c.Tr("org.settings.update_avatar_success"))
diff --git a/internal/route/org/teams.go b/internal/route/org/teams.go
index 779ecb4c..a4072e97 100644
--- a/internal/route/org/teams.go
+++ b/internal/route/org/teams.go
@@ -8,7 +8,7 @@ import (
"path"
"github.com/unknwon/com"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
@@ -90,7 +90,7 @@ func TeamsAction(c *context.Context) {
if db.IsErrLastOrgOwner(err) {
c.Flash.Error(c.Tr("form.last_org_owner"))
} else {
- log.Error(3, "Action(%s): %v", c.Params(":action"), err)
+ log.Error("Action(%s): %v", c.Params(":action"), err)
c.JSON(200, map[string]interface{}{
"ok": false,
"err": err.Error(),
@@ -134,7 +134,7 @@ func TeamsRepoAction(c *context.Context) {
}
if err != nil {
- log.Error(3, "Action(%s): '%s' %v", c.Params(":action"), c.Org.Team.Name, err)
+ log.Error("Action(%s): '%s' %v", c.Params(":action"), c.Org.Team.Name, err)
c.Handle(500, "TeamsRepoAction", err)
return
}
diff --git a/internal/route/repo/branch.go b/internal/route/repo/branch.go
index a51c4246..c8d49bbb 100644
--- a/internal/route/repo/branch.go
+++ b/internal/route/repo/branch.go
@@ -7,7 +7,7 @@ package repo
import (
"time"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"github.com/gogs/git-module"
api "github.com/gogs/go-gogs-client"
@@ -125,7 +125,7 @@ func DeleteBranchPost(c *context.Context) {
if len(commitID) > 0 {
branchCommitID, err := c.Repo.GitRepo.GetBranchCommitID(branchName)
if err != nil {
- log.Error(2, "Failed to get commit ID of branch %q: %v", branchName, err)
+ log.Error("Failed to get commit ID of branch %q: %v", branchName, err)
return
}
@@ -138,7 +138,7 @@ func DeleteBranchPost(c *context.Context) {
if err := c.Repo.GitRepo.DeleteBranch(branchName, git.DeleteBranchOptions{
Force: true,
}); err != nil {
- log.Error(2, "Failed to delete branch %q: %v", branchName, err)
+ log.Error("Failed to delete branch %q: %v", branchName, err)
return
}
@@ -149,7 +149,7 @@ func DeleteBranchPost(c *context.Context) {
Repo: c.Repo.Repository.APIFormat(nil),
Sender: c.User.APIFormat(),
}); err != nil {
- log.Error(2, "Failed to prepare webhooks for %q: %v", db.HOOK_EVENT_DELETE, err)
+ log.Error("Failed to prepare webhooks for %q: %v", db.HOOK_EVENT_DELETE, err)
return
}
}
diff --git a/internal/route/repo/editor.go b/internal/route/repo/editor.go
index 54f6c20b..75254a2e 100644
--- a/internal/route/repo/editor.go
+++ b/internal/route/repo/editor.go
@@ -11,7 +11,7 @@ import (
"path"
"strings"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"github.com/gogs/git-module"
"gogs.io/gogs/internal/context"
@@ -91,7 +91,7 @@ func editFile(c *context.Context, isNewFile bool) {
buf = append(buf, d...)
if err, content := template.ToUTF8WithErr(buf); err != nil {
if err != nil {
- log.Error(2, "Failed to convert encoding to UTF-8: %v", err)
+ log.Error("Failed to convert encoding to UTF-8: %v", err)
}
c.Data["FileContent"] = string(buf)
} else {
@@ -278,7 +278,7 @@ func editFilePost(c *context.Context, f form.EditRepoFile, isNewFile bool) {
Content: strings.Replace(f.Content, "\r", "", -1),
IsNewFile: isNewFile,
}); err != nil {
- log.Error(2, "Failed to update repo file: %v", err)
+ log.Error("Failed to update repo file: %v", err)
c.FormErr("TreePath")
c.RenderWithErr(c.Tr("repo.editor.fail_to_update_file", f.TreePath, errors.InternalServerError), EDIT_FILE, &f)
return
@@ -385,7 +385,7 @@ func DeleteFilePost(c *context.Context, f form.DeleteRepoFile) {
TreePath: c.Repo.TreePath,
Message: message,
}); err != nil {
- log.Error(2, "Failed to delete repo file: %v", err)
+ log.Error("Failed to delete repo file: %v", err)
c.RenderWithErr(c.Tr("repo.editor.fail_to_delete_file", c.Repo.TreePath, errors.InternalServerError), DELETE_FILE, &f)
return
}
@@ -505,7 +505,7 @@ func UploadFilePost(c *context.Context, f form.UploadRepoFile) {
Message: message,
Files: f.Files,
}); err != nil {
- log.Error(2, "Failed to upload files: %v", err)
+ log.Error("Failed to upload files: %v", err)
c.FormErr("TreePath")
c.RenderWithErr(c.Tr("repo.editor.unable_to_upload_files", f.TreePath, errors.InternalServerError), UPLOAD_FILE, &f)
return
diff --git a/internal/route/repo/http.go b/internal/route/repo/http.go
index 10438636..be80d379 100644
--- a/internal/route/repo/http.go
+++ b/internal/route/repo/http.go
@@ -16,8 +16,8 @@ import (
"strings"
"time"
- log "gopkg.in/clog.v1"
"gopkg.in/macaron.v1"
+ log "unknwon.dev/clog/v2"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
@@ -235,7 +235,7 @@ func serviceRPC(h serviceHandler, service string) {
if h.r.Header.Get("Content-Encoding") == "gzip" {
reqBody, err = gzip.NewReader(reqBody)
if err != nil {
- log.Error(2, "HTTP.Get: fail to create gzip reader: %v", err)
+ log.Error("HTTP.Get: fail to create gzip reader: %v", err)
h.w.WriteHeader(http.StatusInternalServerError)
return
}
@@ -258,7 +258,7 @@ func serviceRPC(h serviceHandler, service string) {
cmd.Stderr = &stderr
cmd.Stdin = reqBody
if err = cmd.Run(); err != nil {
- log.Error(2, "HTTP.serviceRPC: fail to serve RPC '%s': %v - %s", service, err, stderr.String())
+ log.Error("HTTP.serviceRPC: fail to serve RPC '%s': %v - %s", service, err, stderr.String())
h.w.WriteHeader(http.StatusInternalServerError)
return
}
@@ -286,7 +286,7 @@ func gitCommand(dir string, args ...string) []byte {
cmd.Dir = dir
out, err := cmd.Output()
if err != nil {
- log.Error(2, fmt.Sprintf("Git: %v - %s", err, out))
+ log.Error(fmt.Sprintf("Git: %v - %s", err, out))
}
return out
}
diff --git a/internal/route/repo/issue.go b/internal/route/repo/issue.go
index 6b7ef1fb..76c63363 100644
--- a/internal/route/repo/issue.go
+++ b/internal/route/repo/issue.go
@@ -15,7 +15,7 @@ import (
"github.com/unknwon/com"
"github.com/unknwon/paginater"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
@@ -891,7 +891,7 @@ func NewComment(c *context.Context, f form.CreateComment) {
c.Flash.Info(c.Tr("repo.pulls.open_unmerged_pull_exists", pr.Index))
} else {
if err = issue.ChangeStatus(c.User, c.Repo.Repository, f.Status == "close"); err != nil {
- log.Error(2, "ChangeStatus: %v", err)
+ log.Error("ChangeStatus: %v", err)
} else {
log.Trace("Issue [%d] status changed to closed: %v", issue.ID, issue.IsClosed)
}
diff --git a/internal/route/repo/pull.go b/internal/route/repo/pull.go
index 38c04c7c..d2cb52cb 100644
--- a/internal/route/repo/pull.go
+++ b/internal/route/repo/pull.go
@@ -10,7 +10,7 @@ import (
"strings"
"github.com/unknwon/com"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"github.com/gogs/git-module"
@@ -28,7 +28,7 @@ const (
PULL_COMMITS = "repo/pulls/commits"
PULL_FILES = "repo/pulls/files"
- PULL_REQUEST_TEMPLATE_KEY = "PullRequestTemplate"
+ PULL_REQUEST_TEMPLATE_KEY = "PullRequestTemplate"
PULL_REQUEST_TITLE_TEMPLATE_KEY = "PullRequestTitleTemplate"
)
@@ -648,7 +648,7 @@ func CompareAndPullRequest(c *context.Context) {
if c.Data[PULL_REQUEST_TITLE_TEMPLATE_KEY] != nil {
customTitle := c.Data[PULL_REQUEST_TITLE_TEMPLATE_KEY].(string)
- r := strings.NewReplacer("{{headBranch}}", headBranch,"{{baseBranch}}", baseBranch)
+ r := strings.NewReplacer("{{headBranch}}", headBranch, "{{baseBranch}}", baseBranch)
c.Data["title"] = r.Replace(customTitle)
}
diff --git a/internal/route/repo/release.go b/internal/route/repo/release.go
index 0ec048e2..d7c5aec3 100644
--- a/internal/route/repo/release.go
+++ b/internal/route/repo/release.go
@@ -8,7 +8,7 @@ import (
"fmt"
"strings"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
diff --git a/internal/route/repo/repo.go b/internal/route/repo/repo.go
index c6582815..7d906242 100644
--- a/internal/route/repo/repo.go
+++ b/internal/route/repo/repo.go
@@ -11,7 +11,7 @@ import (
"strings"
"github.com/unknwon/com"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"github.com/gogs/git-module"
@@ -139,7 +139,7 @@ func CreatePost(c *context.Context, f form.CreateRepo) {
if repo != nil {
if errDelete := db.DeleteRepository(ctxUser.ID, repo.ID); errDelete != nil {
- log.Error(4, "DeleteRepository: %v", errDelete)
+ log.Error("DeleteRepository: %v", errDelete)
}
}
@@ -211,7 +211,7 @@ func MigratePost(c *context.Context, f form.MigrateRepo) {
if repo != nil {
if errDelete := db.DeleteRepository(ctxUser.ID, repo.ID); errDelete != nil {
- log.Error(4, "DeleteRepository: %v", errDelete)
+ log.Error("DeleteRepository: %v", errDelete)
}
}
diff --git a/internal/route/repo/setting.go b/internal/route/repo/setting.go
index e0305702..f3f2432b 100644
--- a/internal/route/repo/setting.go
+++ b/internal/route/repo/setting.go
@@ -12,7 +12,7 @@ import (
"github.com/gogs/git-module"
"github.com/unknwon/com"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
@@ -100,7 +100,7 @@ func SettingsPost(c *context.Context, f form.RepoSetting) {
if isNameChanged {
if err := db.RenameRepoAction(c.User, oldRepoName, repo); err != nil {
- log.Error(2, "RenameRepoAction: %v", err)
+ log.Error("RenameRepoAction: %v", err)
}
}
@@ -410,7 +410,7 @@ func ChangeCollaborationAccessMode(c *context.Context) {
if err := c.Repo.Repository.ChangeCollaborationAccessMode(
c.QueryInt64("uid"),
db.AccessMode(c.QueryInt("mode"))); err != nil {
- log.Error(2, "ChangeCollaborationAccessMode: %v", err)
+ log.Error("ChangeCollaborationAccessMode: %v", err)
return
}
diff --git a/internal/route/repo/view.go b/internal/route/repo/view.go
index 8b7defed..b03a2cc3 100644
--- a/internal/route/repo/view.go
+++ b/internal/route/repo/view.go
@@ -13,7 +13,7 @@ import (
"strings"
"github.com/unknwon/paginater"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"github.com/gogs/git-module"
@@ -176,7 +176,7 @@ func renderFile(c *context.Context, entry *git.TreeEntry, treeLink, rawLink stri
var fileContent string
if err, content := template.ToUTF8WithErr(buf); err != nil {
if err != nil {
- log.Error(4, "ToUTF8WithErr: %s", err)
+ log.Error("ToUTF8WithErr: %s", err)
}
fileContent = string(buf)
} else {
@@ -186,7 +186,7 @@ func renderFile(c *context.Context, entry *git.TreeEntry, treeLink, rawLink stri
var output bytes.Buffer
lines := strings.Split(fileContent, "\n")
// Remove blank line at the end of file
- if len(lines) > 0 && len(lines[len(lines)-1])==0 {
+ if len(lines) > 0 && len(lines[len(lines)-1]) == 0 {
lines = lines[:len(lines)-1]
}
for index, line := range lines {
diff --git a/internal/route/user/auth.go b/internal/route/user/auth.go
index 3613297b..d2fcee83 100644
--- a/internal/route/user/auth.go
+++ b/internal/route/user/auth.go
@@ -9,7 +9,7 @@ import (
"net/url"
"github.com/go-macaron/captcha"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
@@ -239,7 +239,7 @@ func LoginTwoFactorPost(c *context.Context) {
return
}
if err = c.Cache.Put(u.TwoFactorCacheKey(passcode), 1, 60); err != nil {
- log.Error(2, "Failed to put cache 'two factor passcode': %v", err)
+ log.Error("Failed to put cache 'two factor passcode': %v", err)
}
afterLogin(c, u, c.Session.Get("twoFactorRemember").(bool))
@@ -376,7 +376,7 @@ func SignUpPost(c *context.Context, cpt *captcha.Captcha, f form.Register) {
c.Success(ACTIVATE)
if err := c.Cache.Put(u.MailResendCacheKey(), 1, 180); err != nil {
- log.Error(2, "Failed to put cache key 'mail resend': %v", err)
+ log.Error("Failed to put cache key 'mail resend': %v", err)
}
return
}
@@ -401,7 +401,7 @@ func Activate(c *context.Context) {
mailer.SendActivateAccountMail(c.Context, db.NewMailerUser(c.User))
if err := c.Cache.Put(c.User.MailResendCacheKey(), 1, 180); err != nil {
- log.Error(2, "Failed to put cache key 'mail resend': %v", err)
+ log.Error("Failed to put cache key 'mail resend': %v", err)
}
}
} else {
@@ -506,7 +506,7 @@ func ForgotPasswdPost(c *context.Context) {
mailer.SendResetPasswordMail(c.Context, db.NewMailerUser(u))
if err = c.Cache.Put(u.MailResendCacheKey(), 1, 180); err != nil {
- log.Error(2, "Failed to put cache key 'mail resend': %v", err)
+ log.Error("Failed to put cache key 'mail resend': %v", err)
}
c.Data["Hours"] = setting.Service.ActiveCodeLives / 60
diff --git a/internal/route/user/setting.go b/internal/route/user/setting.go
index 7c1c4696..ef0bf5cc 100644
--- a/internal/route/user/setting.go
+++ b/internal/route/user/setting.go
@@ -16,7 +16,7 @@ import (
"github.com/pquerna/otp"
"github.com/pquerna/otp/totp"
"github.com/unknwon/com"
- log "gopkg.in/clog.v1"
+ log "unknwon.dev/clog/v2"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
@@ -144,7 +144,7 @@ func UpdateAvatarSetting(c *context.Context, f form.Avatar, ctxUser *db.User) er
// generate a random one when needed.
if ctxUser.UseCustomAvatar && !com.IsFile(ctxUser.CustomAvatarPath()) {
if err := ctxUser.GenerateRandomAvatar(); err != nil {
- log.Error(2, "generate random avatar [%d]: %v", ctxUser.ID, err)
+ log.Error("generate random avatar [%d]: %v", ctxUser.ID, err)
}
}
}
@@ -278,7 +278,7 @@ func SettingsEmailPost(c *context.Context, f form.AddEmail) {
mailer.SendActivateEmailMail(c.Context, db.NewMailerUser(c.User), email.Email)
if err := c.Cache.Put("MailResendLimit_"+c.User.LowerName, c.User.LowerName, 180); err != nil {
- log.Error(2, "Set cache 'MailResendLimit' failed: %v", err)
+ log.Error("Set cache 'MailResendLimit' failed: %v", err)
}
c.Flash.Info(c.Tr("settings.add_email_confirmation_sent", email.Email, setting.Service.ActiveCodeLives/60))
} else {
Powered by cgit, Themed by Ted Yin.