add requested changes, add some logging

semaphoreui · Jun 8, 2018 · a817d2d · a817d2d
1 parent 087acb8
commit a817d2d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/api/tasks/pool.go b/api/tasks/pool.go
@@ -1,9 +1,10 @@
 package tasks
 
 import (
-	"fmt"
+	"strconv"
 	"time"
 
+	log "github.com/Sirupsen/logrus"
 	"github.com/ansible-semaphore/semaphore/util"
 )
 
@@ -74,8 +75,9 @@ func (p *taskPool) run() {
 	for {
 		select {
 		case task := <-p.register:
-			fmt.Println(task)
 			p.queue = append(p.queue, task)
+			log.Debug(task)
+			task.log("Task " + strconv.Itoa(task.task.ID) + " added to queue")
 		case <-ticker.C:
 			if len(p.queue) == 0 {
 				continue
@@ -85,15 +87,14 @@ func (p *taskPool) run() {
 			}
 
 			if t := p.queue[0]; t.task.Status != taskFailStatus {
-				if t.prepared {
-					fmt.Println("Running a task.")
-					resourceLocker <- &resourceLock{lock: true, holder: t}
-					go t.run()
-					p.queue = p.queue[1:]
-				} else {
-					resourceLocker <- &resourceLock{lock: true, holder: t}
+				log.Info("Set resourse locker with task " + strconv.Itoa(t.task.ID))
+				resourceLocker <- &resourceLock{lock: true, holder: t}
+				if !t.prepared {
 					go t.prepareRun()
+					continue
 				}
+				go t.run()
+				p.queue = p.queue[1:]
 			}
 		}
 	}

diff --git a/api/tasks/runner.go b/api/tasks/runner.go
@@ -14,6 +14,7 @@ import (
 	"strings"
 	"time"
 
+	log "github.com/Sirupsen/logrus"
 	"github.com/ansible-semaphore/semaphore/db"
 	"github.com/ansible-semaphore/semaphore/util"
 )
@@ -49,7 +50,8 @@ func (t *task) prepareRun() {
 	t.prepared = false
 
 	defer func() {
-		fmt.Println("Stopped preparing task")
+		log.Info("Stopped preparing task " + strconv.Itoa(t.task.ID))
+		log.Info("Release resourse locker with task " + strconv.Itoa(t.task.ID))
 		resourceLocker <- &resourceLock{lock: false, holder: t}
 
 		objType := taskTypeID
@@ -130,7 +132,8 @@ func (t *task) prepareRun() {
 
 func (t *task) run() {
 	defer func() {
-		fmt.Println("Stopped running tasks")
+		log.Info("Stopped running task " + strconv.Itoa(t.task.ID))
+		log.Info("Release resourse locker with task " + strconv.Itoa(t.task.ID))
 		resourceLocker <- &resourceLock{lock: false, holder: t}
 
 		now := time.Now()