Updated deps

Dockerfile

@@ -4,6 +4,7 @@ MAINTAINER Hugo González Labrador
 ENV CLAWIO_LOCALFS_META_DATADIR /tmp/localfs
 ENV CLAWIO_LOCALFS_META_TMPDIR /tmp/localfs
 ENV CLAWIO_LOCALFS_META_PORT 57001
+ENV CLAWIO_LOCALFS_META_LOGLEVEL "error"
 ENV CLAWIO_LOCALFS_META_PROP "service-localfs-prop:57003"
 ENV CLAWIO_LOCALFS_META_PROPMAXACTIVE 1024
 ENV CLAWIO_LOCALFS_META_PROPMAXIDLE 1024

environ

@@ -1,6 +1,7 @@
 export CLAWIO_LOCALFS_META_DATADIR=/tmp/localfs
 export CLAWIO_LOCALFS_META_TMPDIR=/tmp/localfs
 export CLAWIO_LOCALFS_META_PORT=57001
+export CLAWIO_LOCALFS_META_LOGLEVEL="error"
 export CLAWIO_LOCALFS_META_PROP="service-localfs-prop:57003"
 export CLAWIO_LOCALFS_META_PROPMAXACTIVE=1024
 export CLAWIO_LOCALFS_META_PROPMAXIDLE=1024

main.go

@@ -17,6 +17,7 @@ const (
 	tmpDirEnvar             = serviceID + "_TMPDIR"
 	portEnvar               = serviceID + "_PORT"
 	propEnvar               = serviceID + "_PROP"
+	logLevelEnvar           = serviceID + "_LOGLEVEL"
 	propMaxActiveEnvar      = serviceID + "_PROPMAXACTIVE"
 	propMaxIdleEnvar        = serviceID + "_PROPMAXIDLE"
 	propMaxConcurrencyEnvar = serviceID + "_PROPMAXCONCURRENCY"
@@ -28,6 +29,7 @@ type environ struct {
 	tmpDir             string
 	port               int
 	prop               string
+	logLevel           string
 	propMaxActive      int
 	propMaxIdle        int
 	propMaxConcurrency int
@@ -45,6 +47,7 @@ func getEnviron() (*environ, error) {
 	e.port = port
 
 	e.prop = os.Getenv(propEnvar)
+	e.logLevel = os.Getenv(logLevelEnvar)
 
 	propMaxActive, err := strconv.Atoi(os.Getenv(propMaxActiveEnvar))
 	if err != nil {
@@ -68,19 +71,18 @@ func getEnviron() (*environ, error) {
 	return e, nil
 }
 func printEnviron(e *environ) {
-	log.Infof("%s=%s", dataDirEnvar, e.dataDir)
-	log.Infof("%s=%s", tmpDirEnvar, e.tmpDir)
-	log.Infof("%s=%d", portEnvar, e.port)
-	log.Infof("%s=%s", propEnvar, e.prop)
-	log.Infof("%s=%d", propMaxActiveEnvar, e.propMaxActive)
-	log.Infof("%s=%d", propMaxIdleEnvar, e.propMaxIdle)
-	log.Infof("%s=%d", propMaxConcurrencyEnvar, e.propMaxConcurrency)
-	log.Infof("%s=%s", sharedSecretEnvar, "******")
+	log.Infof("%s=%s\n", dataDirEnvar, e.dataDir)
+	log.Infof("%s=%s\n", tmpDirEnvar, e.tmpDir)
+	log.Infof("%s=%d\n", portEnvar, e.port)
+	log.Infof("%s=%s\n", propEnvar, e.prop)
+	log.Infof("%s=%d\n", propMaxActiveEnvar, e.propMaxActive)
+	log.Infof("%s=%d\n", propMaxIdleEnvar, e.propMaxIdle)
+	log.Infof("%s=%d\n", propMaxConcurrencyEnvar, e.propMaxConcurrency)
+	log.Infof("%s=%s\n", sharedSecretEnvar, "******")
 }
 
 func main() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
-	log.Infof("Service %s started", serviceID)
 
 	env, err := getEnviron()
 	if err != nil {
@@ -99,6 +101,15 @@ func main() {
 	p.propMaxIdle = env.propMaxIdle
 	p.propMaxConcurrency = env.propMaxConcurrency
 
+	l, err := log.ParseLevel(env.logLevel)
+	if err != nil {
+		l = log.ErrorLevel
+	}
+	log.SetLevel(l)
+
+	log.Infof("Service %s started", serviceID)
+	printEnviron(env)
+
 	// Create data and tmp dirs
 	if err := os.MkdirAll(p.dataDir, 0644); err != nil {
 		log.Error(err)

server.go

@@ -78,7 +78,11 @@ type server struct {
 
 func (s *server) Home(ctx context.Context, req *pb.HomeReq) (*pb.Void, error) {
 
-	traceID := getTraceID(ctx)
+	traceID, err := getTraceID(ctx)
+	if err != nil {
+		rus.Error(err)
+		return &pb.Void{}, err
+	}
 	log := rus.WithField("trace", traceID).WithField("svc", serviceID)
 	ctx = newTraceContext(ctx, traceID)
 
@@ -186,7 +190,11 @@ func (s *server) Home(ctx context.Context, req *pb.HomeReq) (*pb.Void, error) {
 
 func (s *server) Mkdir(ctx context.Context, req *pb.MkdirReq) (*pb.Void, error) {
 
-	traceID := getTraceID(ctx)
+	traceID, err := getTraceID(ctx)
+	if err != nil {
+		rus.Error(err)
+		return &pb.Void{}, err
+	}
 	log := rus.WithField("trace", traceID).WithField("svc", serviceID)
 	ctx = newTraceContext(ctx, traceID)
 
@@ -276,7 +284,11 @@ func (s *server) Mkdir(ctx context.Context, req *pb.MkdirReq) (*pb.Void, error)
 
 func (s *server) Stat(ctx context.Context, req *pb.StatReq) (*pb.Metadata, error) {
 
-	traceID := getTraceID(ctx)
+	traceID, err := getTraceID(ctx)
+	if err != nil {
+		rus.Error(err)
+		return &pb.Metadata{}, err
+	}
 	log := rus.WithField("trace", traceID).WithField("svc", serviceID)
 	ctx = newTraceContext(ctx, traceID)
 
@@ -439,7 +451,11 @@ func (s *server) Stat(ctx context.Context, req *pb.StatReq) (*pb.Metadata, error
 
 func (s *server) Cp(ctx context.Context, req *pb.CpReq) (*pb.Void, error) {
 
-	traceID := getTraceID(ctx)
+	traceID, err := getTraceID(ctx)
+	if err != nil {
+		rus.Error(err)
+		return &pb.Void{}, err
+	}
 	log := rus.WithField("trace", traceID).WithField("svc", serviceID)
 	ctx = newTraceContext(ctx, traceID)
 
@@ -562,7 +578,11 @@ func (s *server) Cp(ctx context.Context, req *pb.CpReq) (*pb.Void, error) {
 
 func (s *server) Mv(ctx context.Context, req *pb.MvReq) (*pb.Void, error) {
 
-	traceID := getTraceID(ctx)
+	traceID, err := getTraceID(ctx)
+	if err != nil {
+		rus.Error(err)
+		return &pb.Void{}, err
+	}
 	log := rus.WithField("trace", traceID).WithField("svc", serviceID)
 	ctx = newTraceContext(ctx, traceID)
 
@@ -662,7 +682,11 @@ func (s *server) Mv(ctx context.Context, req *pb.MvReq) (*pb.Void, error) {
 
 func (s *server) Rm(ctx context.Context, req *pb.RmReq) (*pb.Void, error) {
 
-	traceID := getTraceID(ctx)
+	traceID, err := getTraceID(ctx)
+	if err != nil {
+		rus.Error(err)
+		return &pb.Void{}, err
+	}
 	log := rus.WithField("trace", traceID).WithField("svc", serviceID)
 	ctx = newTraceContext(ctx, traceID)
 

utils.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"code.google.com/p/go-uuid/uuid"
 	"github.com/clawio/service-auth/lib"
+	"github.com/nu7hatch/gouuid"
 	"golang.org/x/net/context"
 	metadata "google.golang.org/grpc/metadata"
 	"io"
@@ -136,21 +136,34 @@ func newTraceContext(ctx context.Context, trace string) context.Context {
 	return ctx
 }
 
-func getTraceID(ctx context.Context) string {
+func getTraceID(ctx context.Context) (string, error) {
 
 	md, ok := metadata.FromContext(ctx)
 	if !ok {
-		return uuid.New()
+		u, err := uuid.NewV4()
+		if err != nil {
+			return "", err
+		}
+		return u.String(), nil
 	}
 
 	tokens := md["trace"]
 	if len(tokens) == 0 {
-		return uuid.New()
+		u, err := uuid.NewV4()
+		if err != nil {
+			return "", err
+		}
+		return u.String(), nil
 	}
 
 	if tokens[0] != "" {
-		return tokens[0]
+		return tokens[0], nil
+	}
+
+	u, err := uuid.NewV4()
+	if err != nil {
+		return "", err
 	}
+	return u.String(), nil
 
-	return uuid.New()
 }