fix(runner): register runner

Author: fiftin

api/runners/runners.go

@@ -8,6 +8,8 @@ import (
 	"encoding/json"
 	"encoding/pem"
 	"fmt"
+	"net/http"
+
 	"github.com/semaphoreui/semaphore/api/helpers"
 	"github.com/semaphoreui/semaphore/db"
 	"github.com/semaphoreui/semaphore/pkg/task_logger"
@@ -16,7 +18,6 @@ import (
 	"github.com/semaphoreui/semaphore/services/tasks"
 	"github.com/semaphoreui/semaphore/util"
 	log "github.com/sirupsen/logrus"
-	"net/http"
 )
 
 func RunnerMiddleware(next http.Handler) http.Handler {
@@ -317,6 +318,11 @@ func RegisterRunner(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	log.WithFields(log.Fields{
+		"runner_id": runner.ID,
+		"context":   "runner",
+	}).Info("New runner registered")
+
 	var res struct {
 		Token string `json:"token"`
 	}

cli/cmd/runner_start.go

@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"time"
+
 	"github.com/semaphoreui/semaphore/util"
 	"github.com/spf13/cobra"
 )
@@ -20,16 +22,21 @@ func runRunner() {
 
 	taskPool := createRunnerJobPool()
 
+	// If --register is passed, try to register the runner if not already registered
 	if runnerStartArgs.register {
 
 		initRunnerRegistrationToken()
 
 		if util.Config.Runner.Token == "" {
 
-			err := taskPool.Register(configFile)
+			for {
+				err := taskPool.Register(configFile)
+
+				if err == nil {
+					break
+				}
 
-			if err != nil {
-				panic(err)
+				time.Sleep(5 * time.Second)
 			}
 
 			_ = util.ConfigInit(persistentFlags.configPath, persistentFlags.noConfig)

db_lib/AnsiblePlaybook.go

@@ -49,7 +49,7 @@ func (p AnsiblePlaybook) RunPlaybook(args []string, environmentVars []string, in
 	ptmx, err := pty.Start(cmd)
 
 	if err != nil {
-		panic(err)
+		return err
 	}
 
 	go func() {

services/runners/job_pool.go

@@ -150,6 +150,8 @@ func (p *JobPool) Unregister() (err error) {
 func (p *JobPool) Run() {
 	logger := JobLogger{Context: "running"}
 
+	launched := false
+
 	if util.Config.Runner.Token == "" {
 		logger.Panic(fmt.Errorf("no token provided"), "read input", "can not retrieve runner token")
 	}
@@ -197,6 +199,9 @@ func (p *JobPool) Run() {
 				}
 
 				if err != nil {
+					logger.ActionError(err, "launch job", "job failed")
+					t.job.Logger.Log("Unable to launch the application. Please contact your system administrator for assistance.")
+
 					if runningJob.status == task_logger.TaskStoppingStatus {
 						runningJob.SetStatus(task_logger.TaskStoppedStatus)
 					} else {
@@ -223,7 +228,12 @@ func (p *JobPool) Run() {
 
 				defer atomic.StoreInt32(&p.processing, 0)
 
-				p.sendProgress()
+				ok := p.sendProgress()
+
+				if ok && !launched {
+					launched = true
+					fmt.Println("Runner connected")
+				}
 
 				if util.Config.Runner.OneOff && len(p.runningJobs) > 0 && !p.hasRunningJobs() {
 					os.Exit(0)
@@ -236,7 +246,7 @@ func (p *JobPool) Run() {
 	}
 }
 
-func (p *JobPool) sendProgress() {
+func (p *JobPool) sendProgress() (ok bool) {
 
 	logger := JobLogger{Context: "sending_progress"}
 
@@ -288,9 +298,13 @@ func (p *JobPool) sendProgress() {
 
 	if resp.StatusCode >= 400 {
 		logger.ActionError(fmt.Errorf("invalid status code"), "send request", "the server returned error "+strconv.Itoa(resp.StatusCode))
+	} else {
+		ok = true
 	}
 
 	defer resp.Body.Close() //nolint:errcheck
+
+	return
 }
 
 func (p *JobPool) getResponseErrorMessage(resp *http.Response) (res string) {