From 2846ff7d31fc93659a2e90fe869ff51c885decfa Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 6 Apr 2014 13:00:20 -0400 Subject: Fix bug related to log --- update.go | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'update.go') diff --git a/update.go b/update.go index 5ccb72fd..97d92408 100644 --- a/update.go +++ b/update.go @@ -6,7 +6,6 @@ package main import ( "container/list" - "fmt" "os" "os/exec" "path" @@ -14,11 +13,11 @@ import ( "strings" "github.com/codegangsta/cli" + qlog "github.com/qiniu/log" + "github.com/gogits/git" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" - "github.com/gogits/gogs/modules/log" - //"github.com/qiniu/log" ) var CmdUpdate = cli.Command{ @@ -31,11 +30,15 @@ gogs serv provide access auth for repositories`, } func newUpdateLogger(execDir string) { - level := "0" logPath := execDir + "/log/update.log" os.MkdirAll(path.Dir(logPath), os.ModePerm) - log.NewLogger(0, "file", fmt.Sprintf(`{"level":%s,"filename":"%s"}`, level, logPath)) - log.Trace("start logging...") + f, err := os.Open(logPath) + if err != nil { + qlog.Fatal(err) + } + + qlog.SetOutput(f) + qlog.Info("Start logging update...") } // for command: ./gogs update @@ -54,14 +57,12 @@ func runUpdate(c *cli.Context) { args := c.Args() if len(args) != 3 { - log.Error("received less 3 parameters") - return + qlog.Fatal("received less 3 parameters") } refName := args[0] if refName == "" { - log.Error("refName is empty, shouldn't use") - return + qlog.Fatal("refName is empty, shouldn't use") } oldCommitId := args[1] newCommitId := args[2] @@ -69,8 +70,7 @@ func runUpdate(c *cli.Context) { isNew := strings.HasPrefix(oldCommitId, "0000000") if isNew && strings.HasPrefix(newCommitId, "0000000") { - log.Error("old rev and new rev both 000000") - return + qlog.Fatal("old rev and new rev both 000000") } userName := os.Getenv("userName") @@ -86,19 +86,18 @@ func runUpdate(c *cli.Context) { repo, err := git.OpenRepository(f) if err != nil { - log.Error("runUpdate.Open repoId: %v", err) - return + qlog.Fatalf("runUpdate.Open repoId: %v", err) } newOid, err := git.NewOidFromString(newCommitId) if err != nil { - log.Error("runUpdate.Ref repoId: %v", err) + qlog.Fatalf("runUpdate.Ref repoId: %v", err) return } newCommit, err := repo.LookupCommit(newOid) if err != nil { - log.Error("runUpdate.Ref repoId: %v", err) + qlog.Fatalf("runUpdate.Ref repoId: %v", err) return } @@ -107,38 +106,38 @@ func runUpdate(c *cli.Context) { if isNew { l, err = repo.CommitsBefore(newCommit.Id()) if err != nil { - log.Error("Find CommitsBefore erro:", err) + qlog.Fatalf("Find CommitsBefore erro:", err) return } } else { oldOid, err := git.NewOidFromString(oldCommitId) if err != nil { - log.Error("runUpdate.Ref repoId: %v", err) + qlog.Fatalf("runUpdate.Ref repoId: %v", err) return } oldCommit, err := repo.LookupCommit(oldOid) if err != nil { - log.Error("runUpdate.Ref repoId: %v", err) + qlog.Fatalf("runUpdate.Ref repoId: %v", err) return } l = repo.CommitsBetween(newCommit, oldCommit) } if err != nil { - log.Error("runUpdate.Commit repoId: %v", err) + qlog.Fatalf("runUpdate.Commit repoId: %v", err) return } sUserId, err := strconv.Atoi(userId) if err != nil { - log.Error("runUpdate.Parse userId: %v", err) + qlog.Fatalf("runUpdate.Parse userId: %v", err) return } repos, err := models.GetRepositoryByName(int64(sUserId), repoName) if err != nil { - log.Error("runUpdate.GetRepositoryByName userId: %v", err) + qlog.Fatalf("runUpdate.GetRepositoryByName userId: %v", err) return } @@ -163,6 +162,6 @@ func runUpdate(c *cli.Context) { //commits = append(commits, []string{lastCommit.Id().String(), lastCommit.Message()}) if err = models.CommitRepoAction(int64(sUserId), userName, actEmail, repos.Id, repoName, git.BranchName(refName), &base.PushCommits{l.Len(), commits}); err != nil { - log.Error("runUpdate.models.CommitRepoAction: %v", err) + qlog.Fatalf("runUpdate.models.CommitRepoAction: %v", err) } } -- cgit v1.2.3 From 794cd27db3de55cce4c5d3716bf9e60fadaa86bc Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 6 Apr 2014 13:07:34 -0400 Subject: Fix bug related to log --- gogs.go | 2 +- serve.go | 53 ++++++++++++++++++++++------------------------------- update.go | 8 -------- 3 files changed, 23 insertions(+), 40 deletions(-) (limited to 'update.go') diff --git a/gogs.go b/gogs.go index 13b9d377..0e48ff7b 100644 --- a/gogs.go +++ b/gogs.go @@ -19,7 +19,7 @@ import ( // Test that go1.2 tag above is included in builds. main.go refers to this definition. const go12tag = true -const APP_VER = "0.2.1.0405 Alpha" +const APP_VER = "0.2.1.0406 Alpha" func init() { base.AppVer = APP_VER diff --git a/serve.go b/serve.go index afc16c28..e7649476 100644 --- a/serve.go +++ b/serve.go @@ -14,7 +14,7 @@ import ( "strings" "github.com/codegangsta/cli" - "github.com/gogits/gogs/modules/log" + qlog "github.com/qiniu/log" //"github.com/gogits/git" "github.com/gogits/gogs/models" @@ -44,11 +44,15 @@ gogs serv provide access auth for repositories`, } func newLogger(execDir string) { - level := "0" logPath := execDir + "/log/serv.log" os.MkdirAll(path.Dir(logPath), os.ModePerm) - log.NewLogger(0, "file", fmt.Sprintf(`{"level":%s,"filename":"%s"}`, level, logPath)) - log.Trace("start logging...") + f, err := os.Open(logPath) + if err != nil { + qlog.Fatal(err) + } + + qlog.SetOutput(f) + qlog.Info("Start logging serv...") } func parseCmd(cmd string) (string, string) { @@ -87,21 +91,18 @@ func runServ(k *cli.Context) { keys := strings.Split(os.Args[2], "-") if len(keys) != 2 { println("auth file format error") - log.Error("auth file format error") - return + qlog.Fatal("auth file format error") } keyId, err := strconv.ParseInt(keys[1], 10, 64) if err != nil { println("auth file format error") - log.Error("auth file format error", err) - return + qlog.Fatal("auth file format error", err) } user, err := models.GetUserByKeyId(keyId) if err != nil { println("You have no right to access") - log.Error("SSH visit error: %v", err) - return + qlog.Fatalf("SSH visit error: %v", err) } cmd := os.Getenv("SSH_ORIGINAL_COMMAND") @@ -115,8 +116,7 @@ func runServ(k *cli.Context) { rr := strings.SplitN(repoPath, "/", 2) if len(rr) != 2 { println("Unavilable repository", args) - log.Error("Unavilable repository %v", args) - return + qlog.Fatalf("Unavilable repository %v", args) } repoUserName := rr[0] repoName := rr[1] @@ -129,9 +129,8 @@ func runServ(k *cli.Context) { repoUser, err := models.GetUserByName(repoUserName) if err != nil { - fmt.Println("You have no right to access") - log.Error("Get user failed", err) - return + println("You have no right to access") + qlog.Fatal("Get user failed", err) } // access check @@ -140,19 +139,16 @@ func runServ(k *cli.Context) { has, err := models.HasAccess(user.LowerName, path.Join(repoUserName, repoName), models.AU_WRITABLE) if err != nil { println("Inernel error:", err) - log.Error(err.Error()) - return + qlog.Fatal(err) } else if !has { println("You have no right to write this repository") - log.Error("User %s has no right to write repository %s", user.Name, repoPath) - return + qlog.Fatalf("User %s has no right to write repository %s", user.Name, repoPath) } case isRead: repo, err := models.GetRepositoryByName(repoUser.Id, repoName) if err != nil { println("Get repository error:", err) - log.Error("Get repository error: " + err.Error()) - return + qlog.Fatal("Get repository error: " + err.Error()) } if !repo.IsPrivate { @@ -162,26 +158,22 @@ func runServ(k *cli.Context) { has, err := models.HasAccess(user.Name, repoPath, models.AU_READABLE) if err != nil { println("Inernel error") - log.Error(err.Error()) - return + qlog.Fatal(err) } if !has { has, err = models.HasAccess(user.Name, repoPath, models.AU_WRITABLE) if err != nil { println("Inernel error") - log.Error(err.Error()) - return + qlog.Fatal(err) } } if !has { println("You have no right to access this repository") - log.Error("You have no right to access this repository") - return + qlog.Fatal("You have no right to access this repository") } default: println("Unknown command") - log.Error("Unknown command") - return + qlog.Fatal("Unknown command") } // for update use @@ -197,7 +189,6 @@ func runServ(k *cli.Context) { if err = gitcmd.Run(); err != nil { println("execute command error:", err.Error()) - log.Error("execute command error: " + err.Error()) - return + qlog.Fatal("execute command error: " + err.Error()) } } diff --git a/update.go b/update.go index 97d92408..aae2e710 100644 --- a/update.go +++ b/update.go @@ -92,13 +92,11 @@ func runUpdate(c *cli.Context) { newOid, err := git.NewOidFromString(newCommitId) if err != nil { qlog.Fatalf("runUpdate.Ref repoId: %v", err) - return } newCommit, err := repo.LookupCommit(newOid) if err != nil { qlog.Fatalf("runUpdate.Ref repoId: %v", err) - return } var l *list.List @@ -107,38 +105,32 @@ func runUpdate(c *cli.Context) { l, err = repo.CommitsBefore(newCommit.Id()) if err != nil { qlog.Fatalf("Find CommitsBefore erro:", err) - return } } else { oldOid, err := git.NewOidFromString(oldCommitId) if err != nil { qlog.Fatalf("runUpdate.Ref repoId: %v", err) - return } oldCommit, err := repo.LookupCommit(oldOid) if err != nil { qlog.Fatalf("runUpdate.Ref repoId: %v", err) - return } l = repo.CommitsBetween(newCommit, oldCommit) } if err != nil { qlog.Fatalf("runUpdate.Commit repoId: %v", err) - return } sUserId, err := strconv.Atoi(userId) if err != nil { qlog.Fatalf("runUpdate.Parse userId: %v", err) - return } repos, err := models.GetRepositoryByName(int64(sUserId), repoName) if err != nil { qlog.Fatalf("runUpdate.GetRepositoryByName userId: %v", err) - return } commits := make([]*base.PushCommit, 0) -- cgit v1.2.3 From 6a16866f4e0908e62c5e5b30e3dc0ef8e4cb0819 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 6 Apr 2014 13:41:58 -0400 Subject: Fix bug related to log --- conf/app.ini | 2 +- modules/base/conf.go | 2 +- serve.go | 3 ++- update.go | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'update.go') diff --git a/conf/app.ini b/conf/app.ini index f88c750e..43033eaa 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -14,7 +14,7 @@ LICENSES = Apache v2 License|GPL v2|MIT License|Affero GPL|Artistic License 2.0| [server] PROTOCOL = http DOMAIN = localhost -ROOT_URL = %(PROTOCOL)://%(DOMAIN)s:%(HTTP_PORT)s/ +ROOT_URL = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s/ HTTP_ADDR = HTTP_PORT = 3000 CERT_FILE = cert.pem diff --git a/modules/base/conf.go b/modules/base/conf.go index 4a6eec70..4285b523 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -288,7 +288,7 @@ func NewConfigContext() { if err != nil { qlog.Fatalf("Fail to get home directory): %v\n", err) } - RepoRootPath = Cfg.MustValue("repository", "ROOT", filepath.Join(homeDir, "git/gogs-repositories")) + RepoRootPath = Cfg.MustValue("repository", "ROOT", filepath.Join(homeDir, "gogs-repositories")) if err = os.MkdirAll(RepoRootPath, os.ModePerm); err != nil { qlog.Fatalf("Fail to create RepoRootPath(%s): %v\n", RepoRootPath, err) } diff --git a/serve.go b/serve.go index e7649476..7e00db47 100644 --- a/serve.go +++ b/serve.go @@ -46,7 +46,8 @@ gogs serv provide access auth for repositories`, func newLogger(execDir string) { logPath := execDir + "/log/serv.log" os.MkdirAll(path.Dir(logPath), os.ModePerm) - f, err := os.Open(logPath) + + f, err := os.OpenFile(logPath, os.O_WRONLY|os.O_APPEND|os.O_CREATE, os.ModePerm) if err != nil { qlog.Fatal(err) } diff --git a/update.go b/update.go index aae2e710..79ce8f52 100644 --- a/update.go +++ b/update.go @@ -32,7 +32,8 @@ gogs serv provide access auth for repositories`, func newUpdateLogger(execDir string) { logPath := execDir + "/log/update.log" os.MkdirAll(path.Dir(logPath), os.ModePerm) - f, err := os.Open(logPath) + + f, err := os.OpenFile(logPath, os.O_WRONLY|os.O_APPEND|os.O_CREATE, os.ModePerm) if err != nil { qlog.Fatal(err) } -- cgit v1.2.3 From db1fe3483ed2c8c0962ee4395073e0b190310602 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 6 Apr 2014 13:54:48 -0400 Subject: Fix bug related to log --- modules/base/conf.go | 3 +-- update.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'update.go') diff --git a/modules/base/conf.go b/modules/base/conf.go index 4285b523..0a618ab1 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -150,6 +150,7 @@ func newLogService() { Cfg.MustValue(modeSec, "CONN")) } + log.Info("%s %s", AppName, AppVer) log.NewLogger(Cfg.MustInt64("log", "BUFFER_LEN", 10000), LogMode, LogConfig) log.Info("Log Mode: %s(%s)", strings.Title(LogMode), levelName) } @@ -292,8 +293,6 @@ func NewConfigContext() { if err = os.MkdirAll(RepoRootPath, os.ModePerm); err != nil { qlog.Fatalf("Fail to create RepoRootPath(%s): %v\n", RepoRootPath, err) } - - log.Info("%s %s", AppName, AppVer) } func NewServices() { diff --git a/update.go b/update.go index 79ce8f52..c9cbb35b 100644 --- a/update.go +++ b/update.go @@ -45,7 +45,7 @@ func newUpdateLogger(execDir string) { // for command: ./gogs update func runUpdate(c *cli.Context) { execDir, _ := base.ExecDir() - newLogger(execDir) + newUpdateLogger(execDir) base.NewConfigContext() models.LoadModelsConfig() -- cgit v1.2.3