From 127f02330dfccff9340b07fd94f34d32d3e8a568 Mon Sep 17 00:00:00 2001
From: miraclesu <suchuangji@gmail.com>
Date: Fri, 17 Mar 2017 11:28:34 +0800
Subject: [PATCH] =?UTF-8?q?job:=20=E6=89=A7=E8=A1=8C=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1=E9=87=8D=E8=AF=95=E7=9A=84=E8=BF=87?=
 =?UTF-8?q?=E7=A8=8B=E4=B8=AD=EF=BC=8C=E4=BB=BB=E5=8A=A1=E6=95=B0=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E4=B9=9F=E6=9C=89=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

如果有任务在重试，限制数点 1 个
---
 models/job.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/models/job.go b/models/job.go
index 067ad8e..fd1cd16 100644
--- a/models/job.go
+++ b/models/job.go
@@ -75,6 +75,12 @@ func (c *Cmd) GetID() string {
 }
 
 func (c *Cmd) Run() {
+	// 同时执行任务数限制
+	if c.Job.limit() {
+		return
+	}
+	defer c.Job.unlimit()
+
 	if c.Job.Retry <= 0 {
 		c.Job.Run()
 		return
@@ -221,12 +227,6 @@ func (j *Job) unlimit() {
 
 // Run 执行任务
 func (j *Job) Run() bool {
-	// 同时执行任务数限制
-	if j.limit() {
-		return true
-	}
-	defer j.unlimit()
-
 	var (
 		cmd         *exec.Cmd
 		proc        *Process