fix uuid & fix tests

This commit is contained in:
Pedro Nasser
2016-08-05 19:51:07 -03:00
parent 4fa9380ecc
commit 214c33e6f0
2 changed files with 5 additions and 2 deletions

View File

@@ -2,6 +2,7 @@ package runner
import ( import (
"bytes" "bytes"
"fmt"
"testing" "testing"
"time" "time"
@@ -21,6 +22,7 @@ func TestRunnerHello(t *testing.T) {
{&models.Route{Image: "iron/hello"}, `{"name": "test"}`, "success", "Hello test!", ""}, {&models.Route{Image: "iron/hello"}, `{"name": "test"}`, "success", "Hello test!", ""},
} { } {
runner := New(&Config{ runner := New(&Config{
ID: fmt.Sprintf("task-hello-%d-%d", i, time.Now().Unix()),
Ctx: context.Background(), Ctx: context.Background(),
Route: test.route, Route: test.route,
Timeout: 5 * time.Second, Timeout: 5 * time.Second,
@@ -57,6 +59,7 @@ func TestRunnerError(t *testing.T) {
{&models.Route{Image: "iron/error"}, `{"name": "test"}`, "error", "", "RuntimeError"}, {&models.Route{Image: "iron/error"}, `{"name": "test"}`, "error", "", "RuntimeError"},
} { } {
runner := New(&Config{ runner := New(&Config{
ID: fmt.Sprintf("task-error-%d-%d", i, time.Now().Unix()),
Ctx: context.Background(), Ctx: context.Background(),
Route: test.route, Route: test.route,
Timeout: 5 * time.Second, Timeout: 5 * time.Second,

View File

@@ -1,6 +1,7 @@
package server package server
import ( import (
"fmt"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"strings" "strings"
@@ -23,7 +24,7 @@ func handleRunner(c *gin.Context) {
log := c.MustGet("log").(logrus.FieldLogger) log := c.MustGet("log").(logrus.FieldLogger)
reqID := uuid.NewV5(uuid.Nil, c.Request.RemoteAddr+c.Request.URL.Path).String() 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) c.Set("reqID", reqID)
log = log.WithFields(logrus.Fields{"request_id": reqID}) log = log.WithFields(logrus.Fields{"request_id": reqID})
@@ -81,7 +82,6 @@ func handleRunner(c *gin.Context) {
} }
log.WithField("routes", routes).Debug("Got routes from datastore") log.WithField("routes", routes).Debug("Got routes from datastore")
for _, el := range routes { for _, el := range routes {
if el.Path == route { if el.Path == route {
run := runner.New(&runner.Config{ run := runner.New(&runner.Config{