Skip to content

Commit b179ee3

Browse files
authored
Fix example generation (#3547)
so the code uses the clue logger
1 parent 63d20e0 commit b179ee3

8 files changed

+9
-10
lines changed

codegen/service/example_svc.go

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ func exampleServiceFile(genpkg string, _ *expr.RootExpr, svc *expr.ServiceExpr,
7272
{Path: "fmt"},
7373
{Path: "strings"},
7474
{Path: path.Join(genpkg, svcName), Name: data.PkgName},
75+
{Path: "goa.design/clue/log"},
7576
{Path: "goa.design/goa/v3/security"},
7677
}
7778
sections := []*codegen.SectionTemplate{

codegen/service/templates/endpoint.go.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ func (s *{{ .ServiceVarName }}srvc) {{ .VarName }}(ctx context.Context{{ if .Pay
2424
{{- end }}
2525
{{- end }}
2626
{{- end }}
27-
s.logger.Print("{{ .ServiceVarName }}.{{ .Name }}")
27+
log.Print(ctx, "{{ .ServiceVarName }}.{{ .Name }}")
2828
return
2929
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{{ printf "New%s returns the %s service implementation." .StructName .Name | comment }}
2-
func New{{ .StructName }}(logger *log.Logger) {{ .PkgName }}.Service {
3-
return &{{ .VarName }}srvc{logger}
2+
func New{{ .StructName }}() {{ .PkgName }}.Service {
3+
return &{{ .VarName }}srvc{}
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
{{ printf "%s service example implementation.\nThe example methods log the requests and return zero values." .Name | comment }}
2-
type {{ .VarName }}srvc struct {
3-
logger *log.Logger
4-
}
2+
type {{ .VarName }}srvc struct {}

grpc/codegen/templates/server_grpc_end.go.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
if lis == nil {
1313
errc <- fmt.Errorf("failed to listen on %q", u.Host)
1414
}
15-
logger.Printf("gRPC server listening on %q", u.Host)
15+
log.Printf(ctx, "gRPC server listening on %q", u.Host)
1616
errc <- srv.Serve(lis)
1717
}()
1818

grpc/codegen/testdata/server-no-server.golden

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func handleGRPCServer(ctx context.Context, u *url.URL, serviceEndpoints *service
4949
if lis == nil {
5050
errc <- fmt.Errorf("failed to listen on %q", u.Host)
5151
}
52-
logger.Printf("gRPC server listening on %q", u.Host)
52+
log.Printf(ctx, "gRPC server listening on %q", u.Host)
5353
errc <- srv.Serve(lis)
5454
}()
5555

grpc/codegen/testdata/server-server-hosting-multiple-services.golden

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func handleGRPCServer(ctx context.Context, u *url.URL, serviceEndpoints *service
5252
if lis == nil {
5353
errc <- fmt.Errorf("failed to listen on %q", u.Host)
5454
}
55-
logger.Printf("gRPC server listening on %q", u.Host)
55+
log.Printf(ctx, "gRPC server listening on %q", u.Host)
5656
errc <- srv.Serve(lis)
5757
}()
5858

grpc/codegen/testdata/server-server-hosting-service-subset.golden

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func handleGRPCServer(ctx context.Context, u *url.URL, serviceEndpoints *service
4949
if lis == nil {
5050
errc <- fmt.Errorf("failed to listen on %q", u.Host)
5151
}
52-
logger.Printf("gRPC server listening on %q", u.Host)
52+
log.Printf(ctx, "gRPC server listening on %q", u.Host)
5353
errc <- srv.Serve(lis)
5454
}()
5555

0 commit comments

Comments
 (0)