Shiloh/githaven
Shiloh/githaven
1
0
Fork 1
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
FuXiaoHei 2014-03-24 23:30:49 +08:00
commit 67b43387f4
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/repo.go
View File

@ -261,6 +261,7 @@ func initRepository(f string, user *User, repo *Repository, initReadme bool, rep
return err return err
} }
/*
// hook/post-update // hook/post-update
pu, err := os.OpenFile(filepath.Join(repoPath, "hooks", "post-update"), os.O_CREATE|os.O_WRONLY, 0777) pu, err := os.OpenFile(filepath.Join(repoPath, "hooks", "post-update"), os.O_CREATE|os.O_WRONLY, 0777)
if err != nil { 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 { if _, err = pu2.WriteString("#!/usr/bin/env bash\ngit update-server-info\n"); err != nil {
return err return err
} }
*/
// Initialize repository according to user's choice. // Initialize repository according to user's choice.
fileName := map[string]string{} fileName := map[string]string{}

6
serve.go
View File

@ -44,6 +44,10 @@ gogs serv provide access auth for repositories`,
Flags: []cli.Flag{}, Flags: []cli.Flag{},
} }
func init() {
log.NewLogger(10000, "file", fmt.Sprintf(`{"filename":"%s"}`, "log/serv.log"))
}
func parseCmd(cmd string) (string, string) { func parseCmd(cmd string) (string, string) {
ss := strings.SplitN(cmd, " ", 2) ss := strings.SplitN(cmd, " ", 2)
if len(ss) != 2 { if len(ss) != 2 {
@ -228,7 +232,7 @@ func runServ(k *cli.Context) {
return return
} }
if ref, ok = refs[refname]; !ok { if ref, ok = refs[refname]; !ok {
println("unknow reference name -", refname, "-") log.Trace("unknow reference name -", refname, "-", b.String())
return return
} }
l, err = ref.AllCommits() l, err = ref.AllCommits()