Improve filtering for push mirrors

Author: harryzcy

models/repo/pushmirror.go

@@ -94,6 +94,15 @@ func GetPushMirrorsByRepoID(repoID int64) ([]*PushMirror, error) {
 	return mirrors, db.GetEngine(db.DefaultContext).Where("repo_id=?", repoID).Find(&mirrors)
 }
 
+// GetPushMirrorsByRepoIDWithSyncOnPush returns push-mirror information of a repository,
+// filtered by sync_on_push.
+func GetPushMirrorsByRepoIDWithSyncOnPush(repoID int64, syncOnPush bool) ([]*PushMirror, error) {
+	mirrors := make([]*PushMirror, 0, 10)
+	return mirrors, db.GetEngine(db.DefaultContext).
+		Where("repo_id=? AND sync_on_push=?", repoID, syncOnPush).
+		Find(&mirrors)
+}
+
 // PushMirrorsIterate iterates all push-mirror repositories.
 func PushMirrorsIterate(limit int, f func(idx int, bean interface{}) error) error {
 	return db.GetEngine(db.DefaultContext).

modules/notification/mirror/mirror.go

@@ -32,16 +32,15 @@ func (m *mirrorNotifier) NotifyPushCommits(pusher *user_model.User, repo *repo_m
 	ctx, _, finished := process.GetManager().AddContext(graceful.GetManager().HammerContext(), fmt.Sprintf("mirrorNotifier.NotifyPushCommits User: %s[%d] in %s[%d]", pusher.Name, pusher.ID, repo.FullName(), repo.ID))
 	defer finished()
 
-	pushMirrors, err := repo_model.GetPushMirrorsByRepoID(repo.ID)
+	syncOnPush := true
+	pushMirrors, err := repo_model.GetPushMirrorsByRepoIDWithSyncOnPush(repo.ID, syncOnPush)
 	if err != nil {
-		log.Error("repo_model.GetPushMirrorsByRepoID failed: %v", err)
+		log.Error("repo_model.GetPushMirrorsByRepoIDWithSyncOnPush failed: %v", err)
 		return
 	}
 
 	for _, mirror := range pushMirrors {
-		if mirror.SyncOnPush {
-			// TODO: push mirror likely will benefit from using a queue
-			pushmirror_service.SyncPushMirror(ctx, mirror.ID)
-		}
+		// TODO: push mirror likely will benefit from using a queue
+		pushmirror_service.SyncPushMirror(ctx, mirror.ID)
 	}
 }