aboutsummaryrefslogtreecommitdiff
path: root/models
diff options
context:
space:
mode:
Diffstat (limited to 'models')
-rw-r--r--models/action.go11
-rw-r--r--models/repo.go4
-rw-r--r--models/user.go2
3 files changed, 13 insertions, 4 deletions
diff --git a/models/action.go b/models/action.go
index 11749293..44d7aea8 100644
--- a/models/action.go
+++ b/models/action.go
@@ -59,14 +59,18 @@ func (a Action) GetContent() string {
// CommitRepoAction records action for commit repository.
func CommitRepoAction(userId int64, userName string,
repoId int64, repoName string, refName string, commits *base.PushCommits) error {
+ log.Trace("action.CommitRepoAction: %d/%s", userId, repoName)
+
bs, err := json.Marshal(commits)
if err != nil {
+ log.Error("action.CommitRepoAction(json): %d/%s", userId, repoName)
return err
}
// Add feeds for user self and all watchers.
watches, err := GetWatches(repoId)
if err != nil {
+ log.Error("action.CommitRepoAction(get watches): %d/%s", userId, repoName)
return err
}
watches = append(watches, Watch{UserId: userId})
@@ -86,20 +90,23 @@ func CommitRepoAction(userId int64, userName string,
RepoName: repoName,
RefName: refName,
})
+ if err != nil {
+ log.Error("action.CommitRepoAction(notify watches): %d/%s", userId, repoName)
+ }
return err
}
// Update repository last update time.
repo, err := GetRepositoryByName(userId, repoName)
if err != nil {
+ log.Error("action.CommitRepoAction(GetRepositoryByName): %d/%s", userId, repoName)
return err
}
repo.IsBare = false
if err = UpdateRepository(repo); err != nil {
+ log.Error("action.CommitRepoAction(UpdateRepository): %d/%s", userId, repoName)
return err
}
-
- log.Trace("action.CommitRepoAction: %d/%s", userId, repo.LowerName)
return nil
}
diff --git a/models/repo.go b/models/repo.go
index f03d7683..6cbfaf10 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{}
@@ -387,7 +389,7 @@ func UpdateRepository(repo *Repository) error {
repo.Website = repo.Website[:255]
}
- _, err := orm.Id(repo.Id).UseBool().Cols("description", "website", "updated").Update(repo)
+ _, err := orm.Id(repo.Id).AllCols().Update(repo)
return err
}
diff --git a/models/user.go b/models/user.go
index d2ed5a90..6ca16ec3 100644
--- a/models/user.go
+++ b/models/user.go
@@ -211,7 +211,7 @@ func UpdateUser(user *User) (err error) {
user.Website = user.Website[:255]
}
- _, err = orm.Id(user.Id).UseBool().Cols("email", "passwd", "avatar", "avatar_email", "website", "location", "is_active", "is_admin", "updated").Update(user)
+ _, err = orm.Id(user.Id).AllCols().Update(user)
return err
}