fix: remove conflicts (#16)

douyu · Sep 7, 2020 · 98de3b6 · 98de3b6
1 parent 3e5bd48
commit 98de3b6
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/pkg/job/job.go b/pkg/job/job.go
@@ -14,6 +14,7 @@ import (
 	"time"
 
 	"github.com/coreos/etcd/clientv3/concurrency"
+	"github.com/douyu/juno-agent/pkg/job/etcd"
 	"github.com/douyu/jupiter/pkg/client/etcdv3"
 	"github.com/douyu/jupiter/pkg/xlog"
 	"go.uber.org/zap"
@@ -60,12 +61,9 @@ type Job struct {
 
 	// 用于访问etcd
 	*worker `json:"-"`
-<<<<<<< feature/cronjob
 
 	mutex  *etcdv3.Mutex
 	locked bool
-=======
->>>>>>> master
 }
 
 // NewEtcdTimeoutContext return a new etcdTimeoutContext
@@ -210,7 +208,6 @@ func (j *Job) ValidRules() error {
 	return nil
 }
 
-<<<<<<< feature/cronjob
 func (j *Job) Lock() error {
 	var err error
 	j.mutex, err = j.Client.NewMutex(LockKeyPrefix+j.ID, concurrency.WithTTL(10))
@@ -237,8 +234,6 @@ func (j *Job) Unlock() {
 	}
 }
 
-=======
->>>>>>> master
 type Timer struct {
 	ID    string   `json:"id"`
 	Cron  string   `json:"timer"`
@@ -299,9 +294,6 @@ func (c *Cmd) GetID() string {
 }
 
 func (c *Cmd) Run() error {
-<<<<<<< feature/cronjob
-=======
-
 	if c.Job.JobType == TypeAlone {
 		mutex, err := etcd.NewMutex(c.Client.Client, LockKeyPrefix+c.Job.ID, concurrency.WithTTL(5))
 		if err != nil {
@@ -316,7 +308,6 @@ func (c *Cmd) Run() error {
 		defer mutex.Unlock()
 	}
 
->>>>>>> master
 	if c.Job.RetryCount <= 0 {
 		err := c.Job.Run()
 		if err != nil {