From 214c33e6f0150bfd4135bf34a34191046ae3c397 Mon Sep 17 00:00:00 2001
From: Pedro Nasser <pedronasser@gmail.com>
Date: Fri, 5 Aug 2016 19:51:07 -0300
Subject: [PATCH] fix uuid & fix tests

---
 api/runner/runner_test.go | 3 +++
 api/server/runner.go      | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/api/runner/runner_test.go b/api/runner/runner_test.go
index 273f96766..38d7a14f8 100644
--- a/api/runner/runner_test.go
+++ b/api/runner/runner_test.go
@@ -2,6 +2,7 @@ package runner
 
 import (
 	"bytes"
+	"fmt"
 	"testing"
 	"time"
 
@@ -21,6 +22,7 @@ func TestRunnerHello(t *testing.T) {
 		{&models.Route{Image: "iron/hello"}, `{"name": "test"}`, "success", "Hello test!", ""},
 	} {
 		runner := New(&Config{
+			ID:      fmt.Sprintf("task-hello-%d-%d", i, time.Now().Unix()),
 			Ctx:     context.Background(),
 			Route:   test.route,
 			Timeout: 5 * time.Second,
@@ -57,6 +59,7 @@ func TestRunnerError(t *testing.T) {
 		{&models.Route{Image: "iron/error"}, `{"name": "test"}`, "error", "", "RuntimeError"},
 	} {
 		runner := New(&Config{
+			ID:      fmt.Sprintf("task-error-%d-%d", i, time.Now().Unix()),
 			Ctx:     context.Background(),
 			Route:   test.route,
 			Timeout: 5 * time.Second,
diff --git a/api/server/runner.go b/api/server/runner.go
index 9ad294cca..e7093e633 100644
--- a/api/server/runner.go
+++ b/api/server/runner.go
@@ -1,6 +1,7 @@
 package server
 
 import (
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"strings"
@@ -23,7 +24,7 @@ func handleRunner(c *gin.Context) {
 
 	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)
 
 	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")
-
 	for _, el := range routes {
 		if el.Path == route {
 			run := runner.New(&runner.Config{