align with golang 1.8 and latest gokit context

ru-rocker · Mar 10, 2017 · 46559b5 · 46559b5
1 parent d1bb1c7
commit 46559b5
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 17 deletions.
diff --git a/lorem-grpc/endpoints.go b/lorem-grpc/endpoints.go
@@ -3,7 +3,7 @@ package lorem_grpc
 import (
 	"github.com/go-kit/kit/endpoint"
 	"errors"
-	"golang.org/x/net/context"
+	"context"
 )
 
 

diff --git a/lorem-grpc/model.go b/lorem-grpc/model.go
@@ -2,7 +2,7 @@ package lorem_grpc
 
 import (
 	"github.com/ru-rocker/gokit-playground/lorem-grpc/pb"
-	"golang.org/x/net/context"
+	"context"
 )
 
 //Encode and Decode Lorem Request

diff --git a/lorem-grpc/service.go b/lorem-grpc/service.go
@@ -4,7 +4,7 @@ import (
 	gl "github.com/drhodes/golorem"
 	"strings"
 	"errors"
-	"golang.org/x/net/context"
+	"context"
 )
 
 var (

diff --git a/lorem-grpc/transport.go b/lorem-grpc/transport.go
@@ -20,10 +20,9 @@ func (s *grpcServer) Lorem(ctx context.Context, r *pb.LoremRequest) (*pb.LoremRe
 }
 
 // create new grpc server
-func NewGRPCServer(ctx context.Context, endpoint Endpoints) pb.LoremServer {
+func NewGRPCServer(_ context.Context, endpoint Endpoints) pb.LoremServer {
 	return &grpcServer{
 		lorem: grpctransport.NewServer(
-			ctx,
 			endpoint.LoremEndpoint,
 			DecodeGRPCLoremRequest,
 			EncodeGRPCLoremResponse,

diff --git a/lorem-logging/endpoints.go b/lorem-logging/endpoints.go
@@ -4,7 +4,8 @@ import (
 	"github.com/go-kit/kit/endpoint"
 	"strings"
 	"errors"
-	"golang.org/x/net/context"
+	"context"
+	//"golang.org/x/net/context"
 )
 
 var (

diff --git a/lorem-logging/lorem-logging.d/main.go b/lorem-logging/lorem-logging.d/main.go
@@ -15,12 +15,19 @@ func main() {
 	ctx := context.Background()
 	errChan := make(chan error)
 
+	logfile, err := os.OpenFile("./golorem.log", os.O_RDWR | os.O_CREATE | os.O_APPEND, 0666)
+	if err != nil {
+		panic(err)
+	}
+	defer logfile.Close()
+
 	// Logging domain.
 	var logger log.Logger
 	{
-		logger = log.NewLogfmtLogger(os.Stderr)
-		logger = log.NewContext(logger).With("ts", log.DefaultTimestampUTC)
-		logger = log.NewContext(logger).With("caller", log.DefaultCaller)
+		w := log.NewSyncWriter(logfile)
+		logger = log.NewLogfmtLogger(w)
+		logger = log.With(logger, "ts", log.DefaultTimestampUTC)
+		logger = log.With(logger, "caller", log.DefaultCaller)
 	}
 
 	var svc lorem_logging.Service

diff --git a/lorem-logging/transport.go b/lorem-logging/transport.go
@@ -10,7 +10,8 @@ import (
 	httptransport "github.com/go-kit/kit/transport/http"
 	"encoding/json"
 	"strconv"
-	"golang.org/x/net/context"
+	//"golang.org/x/net/context"
+	"context"
 )
 
 var (
@@ -19,7 +20,7 @@ var (
 )
 
 // Make Http Handler
-func MakeHttpHandler(ctx context.Context, endpoint Endpoints, logger log.Logger) http.Handler {
+func MakeHttpHandler(_ context.Context, endpoint Endpoints, logger log.Logger) http.Handler {
 	r := mux.NewRouter()
 	options := []httptransport.ServerOption{
 		httptransport.ServerErrorLogger(logger),
@@ -28,7 +29,6 @@ func MakeHttpHandler(ctx context.Context, endpoint Endpoints, logger log.Logger)
 
 	//POST /lorem/{type}/{min}/{max}
 	r.Methods("POST").Path("/lorem/{type}/{min}/{max}").Handler(httptransport.NewServer(
-		ctx,
 		endpoint.LoremEndpoint,
 		decodeLoremRequest,
 		encodeResponse,

diff --git a/lorem/endpoints.go b/lorem/endpoints.go
@@ -4,7 +4,7 @@ import (
 	"github.com/go-kit/kit/endpoint"
 	"strings"
 	"errors"
-	"golang.org/x/net/context"
+	"context"
 )
 
 var (

diff --git a/lorem/lorem.d/main.go b/lorem/lorem.d/main.go
@@ -25,8 +25,8 @@ func main() {
 	var logger log.Logger
 	{
 		logger = log.NewLogfmtLogger(os.Stderr)
-		logger = log.NewContext(logger).With("ts", log.DefaultTimestampUTC)
-		logger = log.NewContext(logger).With("caller", log.DefaultCaller)
+		logger = log.With(logger, "ts", log.DefaultTimestampUTC)
+		logger = log.With(logger, "caller", log.DefaultCaller)
 	}
 
 	r := lorem.MakeHttpHandler(ctx, endpoint, logger)

diff --git a/lorem/transport.go b/lorem/transport.go
@@ -10,7 +10,7 @@ import (
 	httptransport "github.com/go-kit/kit/transport/http"
 	"encoding/json"
 	"strconv"
-	"golang.org/x/net/context"
+	"context"
 )
 
 var (
@@ -28,7 +28,6 @@ func MakeHttpHandler(ctx context.Context, endpoint Endpoints, logger log.Logger)
 
 	//POST /lorem/{type}/{min}/{max}
 	r.Methods("POST").Path("/lorem/{type}/{min}/{max}").Handler(httptransport.NewServer(
-		ctx,
 		endpoint.LoremEndpoint,
 		decodeLoremRequest,
 		encodeResponse,