Add more option when enqueuing a task (retention, timeout, retries) (#64

)

* Add more option when enqueuing a task

* Add timeout and max retries as env variables

HadesAPI/main.go

@@ -19,15 +19,20 @@ type HadesAPIConfig struct {
 	RedisConfig       utils.RedisConfig
 	AuthKey           string `env:"AUTH_KEY"`
 	PrometheusAddress string `env:"PROMETHEUS_ADDRESS" envDefault:""`
+	// How long the task should be kept for monitoring
+	RetentionTime uint `env:"RETENTION_IN_MIN" envDefault:"30"`
+	MaxRetries    uint `env:"MAX_RETRIES" envDefault:"3"`
+	Timeout       uint `env:"TIMEOUT_IN_MIN" envDefault:"0"`
 }
 
+var cfg HadesAPIConfig
+
 func main() {
 	if is_debug := os.Getenv("DEBUG"); is_debug == "true" {
 		log.SetLevel(log.DebugLevel)
 		log.Warn("DEBUG MODE ENABLED")
 	}
 
-	var cfg HadesAPIConfig
 	utils.LoadConfig(&cfg)
 
 	redis_opts := asynq.RedisClientOpt{Addr: cfg.RedisConfig.Addr, Password: cfg.RedisConfig.Pwd}

HadesAPI/router.go

@@ -3,6 +3,7 @@ package main
 import (
 	"encoding/json"
 	"net/http"
+	"time"
 
 	"github.com/Mtze/HadesCI/shared/payload"
 	"github.com/Mtze/HadesCI/shared/utils"
@@ -45,7 +46,13 @@ func AddBuildToQueue(c *gin.Context) {
 
 	task := asynq.NewTask(payload.Name, json_payload)
 	queuePriority := utils.PrioFromInt(payload.Priority)
-	info, err := AsynqClient.Enqueue(task, asynq.Queue(queuePriority))
+	info, err := AsynqClient.Enqueue(
+		task,
+		asynq.Queue(queuePriority),
+		asynq.Retention(time.Duration(cfg.RetentionTime)*time.Minute), // Keep the result for 30 minutes
+		asynq.Timeout(time.Duration(cfg.Timeout)*time.Minute),         // Timeout for each queued task
+		asynq.MaxRetry(int(cfg.MaxRetries)),                           // Retry times
+	)
 	if err != nil {
 		log.WithError(err).Error("Failed to enqueue build")
 		c.String(http.StatusInternalServerError, "Failed to enqueue build")

HadesScheduler/docker/docker.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/Mtze/HadesCI/shared/payload"
 	"github.com/Mtze/HadesCI/shared/utils"
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/client"
@@ -142,7 +141,7 @@ func (d Scheduler) executeStep(ctx context.Context, client *client.Client, step
 	}
 
 	// Start the container
-	err = client.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
+	err = client.ContainerStart(ctx, resp.ID, container.StartOptions{})
 	if err != nil {
 		log.WithError(err).Errorf("Failed to start container %s with ID %s", step.Image, resp.ID)
 		return err