Add support for Async worker

api/server/helpers.go

@@ -36,6 +36,11 @@ type routesResponse struct {
 	Routes  models.Routes `json:"routes"`
 }
 
+type tasksResponse struct {
+	Message string      `json:"message"`
+	Task    models.Task `json:"tasksResponse"`
+}
+
 func testRouter() *gin.Engine {
 	r := gin.Default()
 	ctx := context.Background()
@@ -44,9 +49,11 @@ func testRouter() *gin.Engine {
 		c.Set("ctx", ctx)
 		c.Next()
 	})
-	bindHandlers(r, func(ctx *gin.Context) {
-		handleRequest(ctx, nil)
-	})
+	bindHandlers(r,
+		func(ctx *gin.Context) {
+			handleRequest(ctx, nil)
+		},
+		func(ctx *gin.Context, del bool) {})
 	return r
 }
 

api/server/runner.go

@@ -152,12 +152,6 @@ func handleRequest(c *gin.Context, enqueue models.Enqueue) {
 				Memory:  el.Memory,
 			}
 
-			// Request count metric
-			metricBaseName := "server.handleRequest." + appName + "."
-			runner.LogMetricCount(ctx, (metricBaseName + "requests"), 1)
-
-			metricStart := time.Now()
-
 			var err error
 			var result drivers.RunResult
 			switch el.Type {
@@ -167,7 +161,7 @@ func handleRequest(c *gin.Context, enqueue models.Enqueue) {
 				task := &models.Task{}
 				task.Image = &cfg.Image
 				task.ID = cfg.ID
-				task.GroupName = cfg.AppName
+				task.RouteName = cfg.AppName
 				task.Priority = &priority
 				// TODO: Push to queue
 				enqueue(task)
@@ -191,11 +185,6 @@ func handleRequest(c *gin.Context, enqueue models.Enqueue) {
 				log.WithError(err).Error(models.ErrRunnerRunRoute)
 				c.JSON(http.StatusInternalServerError, simpleError(models.ErrRunnerRunRoute))
 			}
-
-			// Execution time metric
-			metricElapsed := time.Since(metricStart)
-			runner.LogMetricTime(ctx, (metricBaseName + "time"), metricElapsed)
-			runner.LogMetricTime(ctx, "server.handleRunner.exec_time", metricElapsed)
 			return
 		}
 	}

api/server/server.go

@@ -1,7 +1,11 @@
 package server
 
 import (
+	"encoding/json"
+	"io/ioutil"
+	"net/http"
 	"path"
+	"strings"
 
 	"golang.org/x/net/context"
 
@@ -81,11 +85,50 @@ func (s *Server) UseSpecialHandlers(ginC *gin.Context) error {
 	return nil
 }
 
-func (s *Server) handleRequest(ginC *gin.Context) {
+func (s *Server) handleRunnerRequest(c *gin.Context) {
 	enqueue := func(task *models.Task) (*models.Task, error) {
 		return s.MQ.Push(task)
 	}
-	handleRequest(ginC, enqueue)
+	handleRequest(c, enqueue)
+}
+
+func (s *Server) handleTaskRequest(c *gin.Context, del bool) {
+	if !del {
+		task, err := s.MQ.Reserve()
+		if err != nil {
+			logrus.WithError(err)
+			c.JSON(http.StatusInternalServerError, simpleError(models.ErrRoutesList))
+			return
+		}
+		c.JSON(http.StatusAccepted, task)
+	} else {
+		body, err := ioutil.ReadAll(c.Request.Body)
+		if err != nil {
+			logrus.WithError(err)
+			c.JSON(http.StatusInternalServerError, err)
+			return
+		}
+
+		bodyStr := strings.TrimSpace(string(body))
+		if bodyStr == "null" {
+			logrus.WithError(err)
+			c.JSON(http.StatusInternalServerError, err)
+			return
+		}
+
+		var task models.Task
+		if err = json.Unmarshal(body, &task); err != nil {
+			logrus.WithError(err)
+			c.JSON(http.StatusInternalServerError, err)
+		}
+
+		if err := s.MQ.Delete(&task); err != nil {
+			logrus.WithError(err)
+			c.JSON(http.StatusInternalServerError, err)
+			return
+		}
+		c.JSON(http.StatusAccepted, task)
+	}
 }
 
 func extractFields(c *gin.Context) logrus.Fields {
@@ -93,6 +136,7 @@ func extractFields(c *gin.Context) logrus.Fields {
 	for _, param := range c.Params {
 		fields[param.Key] = param.Value
 	}
+
 	return fields
 }
 
@@ -104,14 +148,14 @@ func (s *Server) Run(ctx context.Context) {
 		c.Next()
 	})
 
-	bindHandlers(s.Router, s.handleRequest)
+	bindHandlers(s.Router, s.handleRunnerRequest, s.handleTaskRequest)
 
 	// By default it serves on :8080 unless a
 	// PORT environment variable was defined.
 	s.Router.Run()
 }
 
-func bindHandlers(engine *gin.Engine, reqHandler func(ginC *gin.Context)) {
+func bindHandlers(engine *gin.Engine, reqHandler func(ginC *gin.Context), taskHandler func(ginC *gin.Context, del bool)) {
 	engine.GET("/", handlePing)
 	engine.GET("/version", handleVersion)
 
@@ -136,6 +180,15 @@ func bindHandlers(engine *gin.Engine, reqHandler func(ginC *gin.Context)) {
 		}
 	}
 
+	taskHandlerDelete := func(ginC *gin.Context) {
+		taskHandler(ginC, true)
+	}
+	taskHandlerReserve := func(ginC *gin.Context) {
+		taskHandler(ginC, false)
+	}
+
+	engine.GET("/tasks", taskHandlerReserve)
+	engine.DELETE("/tasks", taskHandlerDelete)
 	engine.Any("/r/:app/*route", reqHandler)
 
 	// This final route is used for extensions, see Server.Add