Fix Go-Kit test (#25)
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net"
|
||||
"net/http"
|
||||
@@ -34,37 +33,36 @@ import (
|
||||
|
||||
func main() {
|
||||
mux := http.NewServeMux()
|
||||
ctx := context.Background()
|
||||
errc := make(chan error)
|
||||
s := grpc.NewServer()
|
||||
var logger log.Logger
|
||||
{
|
||||
logger = log.NewLogfmtLogger(os.Stdout)
|
||||
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)
|
||||
}
|
||||
|
||||
// initialize services
|
||||
{
|
||||
svc := session_svc.New()
|
||||
endpoints := session_endpoints.MakeEndpoints(svc)
|
||||
srv := session_grpctransport.MakeGRPCServer(ctx, endpoints)
|
||||
srv := session_grpctransport.MakeGRPCServer(endpoints)
|
||||
session_pb.RegisterSessionServiceServer(s, srv)
|
||||
session_httptransport.RegisterHandlers(ctx, svc, mux, endpoints)
|
||||
session_httptransport.RegisterHandlers(svc, mux, endpoints)
|
||||
}
|
||||
{
|
||||
svc := sprint_svc.New()
|
||||
endpoints := sprint_endpoints.MakeEndpoints(svc)
|
||||
srv := sprint_grpctransport.MakeGRPCServer(ctx, endpoints)
|
||||
srv := sprint_grpctransport.MakeGRPCServer(endpoints)
|
||||
sprint_pb.RegisterSprintServiceServer(s, srv)
|
||||
sprint_httptransport.RegisterHandlers(ctx, svc, mux, endpoints)
|
||||
sprint_httptransport.RegisterHandlers(svc, mux, endpoints)
|
||||
}
|
||||
{
|
||||
svc := user_svc.New()
|
||||
endpoints := user_endpoints.MakeEndpoints(svc)
|
||||
srv := user_grpctransport.MakeGRPCServer(ctx, endpoints)
|
||||
srv := user_grpctransport.MakeGRPCServer(endpoints)
|
||||
user_pb.RegisterUserServiceServer(s, srv)
|
||||
user_httptransport.RegisterHandlers(ctx, svc, mux, endpoints)
|
||||
user_httptransport.RegisterHandlers(svc, mux, endpoints)
|
||||
}
|
||||
|
||||
// start servers
|
||||
@@ -75,13 +73,13 @@ func main() {
|
||||
}()
|
||||
|
||||
go func() {
|
||||
logger := log.NewContext(logger).With("transport", "HTTP")
|
||||
logger := log.With(logger, "transport", "HTTP")
|
||||
logger.Log("addr", ":8000")
|
||||
errc <- http.ListenAndServe(":8000", handlers.LoggingHandler(os.Stderr, mux))
|
||||
}()
|
||||
|
||||
go func() {
|
||||
logger := log.NewContext(logger).With("transport", "gRPC")
|
||||
logger := log.With(logger, "transport", "gRPC")
|
||||
ln, err := net.Listen("tcp", ":9000")
|
||||
if err != nil {
|
||||
errc <- err
|
||||
|
Reference in New Issue
Block a user