fix

api/replication_job.go

@@ -3,6 +3,7 @@ package api
 import (
 	"io/ioutil"
 	"net/http"
+	"strconv"
 
 	"github.com/vmware/harbor/dao"
 	"github.com/vmware/harbor/utils/log"
@@ -62,6 +63,9 @@ func (ja *RepJobAPI) GetLog() {
 	}
 
 	if resp.StatusCode == http.StatusOK {
+		ja.Ctx.ResponseWriter.Header().Set(http.CanonicalHeaderKey("Content-Disposition"), "attachment; filename=replication_job.log")
+		ja.Ctx.ResponseWriter.Header().Set(http.CanonicalHeaderKey("Content-Type"), resp.Header.Get(http.CanonicalHeaderKey("Content-Type")))
+		ja.Ctx.ResponseWriter.Header().Set(http.CanonicalHeaderKey("Content-Length"), strconv.Itoa(len(b)))
 		if _, err = ja.Ctx.ResponseWriter.Write(b); err != nil {
 			log.Errorf("failed to write log to response; %v", err)
 			ja.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))

api/replication_policy.go

@@ -14,6 +14,7 @@ import (
 type RepPolicyAPI struct {
 	BaseAPI
 	policyID int64
+	policy   *models.RepPolicy
 }
 
 func (pa *RepPolicyAPI) Prepare() {
@@ -41,6 +42,7 @@ func (pa *RepPolicyAPI) Prepare() {
 		if p == nil {
 			pa.CustomAbort(http.StatusNotFound, fmt.Sprintf("policy does not exist, id: %v", pa.policyID))
 		}
+		pa.policy = p
 	}
 }
 
@@ -73,13 +75,15 @@ func (pa *RepPolicyAPI) Post() {
 		return
 	}
 
-	go func() {
-		if err := TriggerReplication(pid, "", nil, models.RepOpTransfer); err != nil {
-			log.Errorf("failed to trigger replication of %d: %v", pid, err)
-		} else {
-			log.Infof("replication of %d triggered", pid)
-		}
-	}()
+	if policy.Enabled == 1 {
+		go func() {
+			if err := TriggerReplication(pid, "", nil, models.RepOpTransfer); err != nil {
+				log.Errorf("failed to trigger replication of %d: %v", pid, err)
+			} else {
+				log.Infof("replication of %d triggered", pid)
+			}
+		}()
+	}
 
 	pa.Redirect(http.StatusCreated, strconv.FormatInt(pid, 10))
 }
@@ -90,17 +94,17 @@ type enablementReq struct {
 
 func (pa *RepPolicyAPI) UpdateEnablement() {
 	e := enablementReq{}
-	var err error
 	pa.DecodeJSONReq(&e)
-	if e.Enabled == 1 {
-		err = dao.EnableRepPolicy(pa.policyID)
-	} else if e.Enabled == 0 {
-		err = dao.DisableRepPolicy(pa.policyID)
-	} else {
+	if e.Enabled != 0 && e.Enabled != 1 {
 		pa.RenderError(http.StatusBadRequest, "invalid enabled value")
 		return
 	}
-	if err != nil {
+
+	if pa.policy.Enabled == e.Enabled {
+		return
+	}
+
+	if err := dao.UpdateRepPolicyEnablement(pa.policyID, e.Enabled); err != nil {
 		log.Errorf("Failed to update policy enablement in DB, error: %v", err)
 		pa.RenderError(http.StatusInternalServerError, "Internal Error")
 		return

api/utils.go

@@ -158,7 +158,7 @@ func TriggerReplicationByRepository(repository string, tags []string, operation
 	}
 
 	for _, policy := range policies {
-		if err := TriggerReplication(policy.ProjectID, repository, tags, operation); err != nil {
+		if err := TriggerReplication(policy.ID, repository, tags, operation); err != nil {
 			log.Errorf("failed to trigger replication of %d for %s: %v", policy.ID, repository, err)
 		} else {
 			log.Infof("replication of %d for %s triggered", policy.ID, repository)

dao/replication_job.go

@@ -3,9 +3,10 @@ package dao
 import (
 	"fmt"
 
+	"strings"
+
 	"github.com/astaxie/beego/orm"
 	"github.com/vmware/harbor/models"
-	"strings"
 )
 
 func AddRepTarget(target models.RepTarget) (int64, error) {
@@ -81,23 +82,21 @@ func DeleteRepPolicy(id int64) error {
 	_, err := o.Delete(&models.RepPolicy{ID: id})
 	return err
 }
-func updateRepPolicyEnablement(id int64, enabled int) error {
+func UpdateRepPolicyEnablement(id int64, enabled int) error {
 	o := orm.NewOrm()
 	p := models.RepPolicy{
 		ID:      id,
 		Enabled: enabled}
-	num, err := o.Update(&p, "Enabled")
-	if num == 0 {
-		err = fmt.Errorf("Failed to update replication policy with id: %d", id)
-	}
+	_, err := o.Update(&p, "Enabled")
+
 	return err
 }
 func EnableRepPolicy(id int64) error {
-	return updateRepPolicyEnablement(id, 1)
+	return UpdateRepPolicyEnablement(id, 1)
 }
 
 func DisableRepPolicy(id int64) error {
-	return updateRepPolicyEnablement(id, 0)
+	return UpdateRepPolicyEnablement(id, 0)
 }
 
 func AddRepJob(job models.RepJob) (int64, error) {

job/replication/delete.go

@@ -44,7 +44,7 @@ type Deleter struct {
 
 // NewDeleter returns a Deleter
 func NewDeleter(repository string, tags []string, dstURL, dstUsr, dstPwd string, logger *log.Logger) *Deleter {
-	return &Deleter{
+	deleter := &Deleter{
 		repository: repository,
 		tags:       tags,
 		dstURL:     dstURL,
@@ -52,6 +52,9 @@ func NewDeleter(repository string, tags []string, dstURL, dstUsr, dstPwd string,
 		dstPwd:     dstPwd,
 		logger:     logger,
 	}
+	deleter.logger.Infof("initialization completed: repository: %s, tags: %v, destination URL: %s, destination user: %s",
+		deleter.repository, deleter.tags, deleter.dstURL, deleter.dstUsr)
+	return deleter
 }
 
 // Exit ...

job/statemachine.go

@@ -214,6 +214,8 @@ func (sm *JobSM) Reset(jid int64) error {
 
 	//init states handlers
 	sm.Logger = utils.NewLogger(sm.JobID)
+	sm.Handlers = make(map[string]StateHandler)
+	sm.Transitions = make(map[string]map[string]struct{})
 	sm.CurrentState = models.JobPending
 
 	sm.AddTransition(models.JobPending, models.JobRunning, StatusUpdater{DummyHandler{JobID: sm.JobID}, models.JobRunning})

service/notification.go

@@ -70,6 +70,11 @@ func (n *NotificationHandler) Post() {
 			if username == "" {
 				username = "anonymous"
 			}
+
+			if username == "job-service-user" {
+				return
+			}
+
 			go dao.AccessLog(username, project, repo, repoTag, action)
 			if action == "push" {
 				go func() {