summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFuXiaoHei <fuxiaohei@hexiaz.com>2014-03-24 23:30:49 +0800
committerFuXiaoHei <fuxiaohei@hexiaz.com>2014-03-24 23:30:49 +0800
commit67b43387f44b9e3a03f471d0782bfae34a9b9357 (patch)
tree1e64a9df900750fe77f38f3445e194a29f42821b
parent3473aa9e42b670aecaf328c8d281d91b0f7f8923 (diff)
parent0e28dcdac402b3bfc8336fe250e3418939467208 (diff)
downloadgitea-67b43387f44b9e3a03f471d0782bfae34a9b9357.tar.gz
gitea-67b43387f44b9e3a03f471d0782bfae34a9b9357.zip
Merge remote-tracking branch 'origin/master'
-rw-r--r--models/repo.go2
-rw-r--r--serve.go6
2 files changed, 7 insertions, 1 deletions
diff --git a/models/repo.go b/models/repo.go
index a76966b057..6cbfaf1059 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -261,6 +261,7 @@ func initRepository(f string, user *User, repo *Repository, initReadme bool, rep
return err
}
+ /*
// hook/post-update
pu, err := os.OpenFile(filepath.Join(repoPath, "hooks", "post-update"), os.O_CREATE|os.O_WRONLY, 0777)
if err != nil {
@@ -282,6 +283,7 @@ func initRepository(f string, user *User, repo *Repository, initReadme bool, rep
if _, err = pu2.WriteString("#!/usr/bin/env bash\ngit update-server-info\n"); err != nil {
return err
}
+ */
// Initialize repository according to user's choice.
fileName := map[string]string{}
diff --git a/serve.go b/serve.go
index 5b2f2e972a..06815b65df 100644
--- a/serve.go
+++ b/serve.go
@@ -44,6 +44,10 @@ gogs serv provide access auth for repositories`,
Flags: []cli.Flag{},
}
+func init() {
+ log.NewLogger(10000, "file", fmt.Sprintf(`{"filename":"%s"}`, "log/serv.log"))
+}
+
func parseCmd(cmd string) (string, string) {
ss := strings.SplitN(cmd, " ", 2)
if len(ss) != 2 {
@@ -228,7 +232,7 @@ func runServ(k *cli.Context) {
return
}
if ref, ok = refs[refname]; !ok {
- println("unknow reference name -", refname, "-")
+ log.Trace("unknow reference name -", refname, "-", b.String())
return
}
l, err = ref.AllCommits()