alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

async calls return the call_id/task_id

Browse Source
This commit is contained in:
Seif Lotfy
2016-10-01 04:04:51 +02:00
parent d8801d5be7
commit a8535120da
3 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api/server/runner.go
View File

@@ -14,16 +14,16 @@ import (
"github.com/Sirupsen/logrus"
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api/common"
"github.com/iron-io/functions/api/models"
"github.com/iron-io/functions/api/runner"
titancommon "github.com/iron-io/worker/common"
"github.com/iron-io/worker/runner/drivers"
"github.com/satori/go.uuid"
)
func handleSpecial(c *gin.Context) {
ctx := c.MustGet("ctx").(context.Context)
log := titancommon.Logger(ctx)
log := common.Logger(ctx)
err := Api.UseSpecialHandlers(c)
if err != nil {
@@ -39,12 +39,12 @@ func handleRequest(c *gin.Context, enqueue models.Enqueue) {
}
ctx := c.MustGet("ctx").(context.Context)
log := titancommon.Logger(ctx)
log := common.Logger(ctx)
reqID := uuid.NewV5(uuid.Nil, fmt.Sprintf("%s%s%d", c.Request.RemoteAddr, c.Request.URL.Path, time.Now().Unix())).String()
c.Set("reqID", reqID) // todo: put this in the ctx instead of gin's
log = log.WithFields(logrus.Fields{"request_id": reqID})
ctx, log = common.LoggerWithFields(ctx, logrus.Fields{"call_id": reqID})
var err error
@@ -107,7 +107,7 @@ func handleRequest(c *gin.Context, enqueue models.Enqueue) {
log.WithField("routes", routes).Debug("Got routes from datastore")
for _, el := range routes {
log = log.WithFields(logrus.Fields{
"app": appName, "route": el.Path, "image": el.Image, "request_id": reqID})
"app": appName, "route": el.Path, "image": el.Image})
if params, match := matchRoute(el.Path, route); match {
@@ -156,15 +156,17 @@ func handleRequest(c *gin.Context, enqueue models.Enqueue) {
var result drivers.RunResult
switch el.Type {
case "async":
// TODO: Create Task
// Create Task
priority := int32(0)
task := &models.Task{}
task.Image = &cfg.Image
task.ID = cfg.ID
task.RouteName = cfg.AppName
task.Priority = &priority
// TODO: Push to queue
// Push to queue
enqueue(task)
log.Info("Added new task to queue")
default:
if result, err = Api.Runner.Run(c, cfg); err != nil {
break