Skip to content

Commit 26c8291

Browse files
committed
feat(jzero): Update template log and gitignore
1 parent 338c281 commit 26c8291

9 files changed

Lines changed: 19 additions & 44 deletions

File tree

cmd/jzero/.template/frame/api/app/.gitignore.tpl

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
# Go workspace file
2121
go.work
22+
go.work.sum
2223

2324
# idea
2425
.idea
@@ -27,12 +28,4 @@ go.work
2728
.vscode
2829

2930
# logs
30-
logs
31-
32-
# goreleaser output
33-
dist
34-
35-
# unix sock
36-
*.sock
37-
38-
/{{ .APP }}
31+
logs

cmd/jzero/.template/frame/api/app/cmd/server.go.tpl

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@ var serverCmd = &cobra.Command{
3131
logx.Must(err)
3232

3333
// set up logger
34-
if err := logx.SetUp(c.Log.LogConf); err != nil {
35-
logx.Must(err)
36-
}
37-
if c.Log.LogConf.Mode != "console" {
38-
logx.AddWriter(logx.NewWriter(os.Stdout))
39-
}
34+
logx.Must(logx.SetUp(c.Log.LogConf))
4035

4136
svcCtx := svc.NewServiceContext(cc)
4237
run(svcCtx)

cmd/jzero/.template/frame/api/app/etc/etc.yaml.tpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ rest:
44
port: 8001
55

66
log:
7+
serviceName: {{ .APP }}
78
encoding: plain
9+
level: info
10+
mode: console

cmd/jzero/.template/frame/gateway/app/.gitignore.tpl

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
# Go workspace file
2121
go.work
22+
go.work.sum
2223

2324
# idea
2425
.idea
@@ -27,12 +28,4 @@ go.work
2728
.vscode
2829

2930
# logs
30-
logs
31-
32-
# goreleaser output
33-
dist
34-
35-
# unix sock
36-
*.sock
37-
38-
/{{ .APP }}
31+
logs

cmd/jzero/.template/frame/gateway/app/cmd/server.go.tpl

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,7 @@ var serverCmd = &cobra.Command{
3333
logx.Must(err)
3434

3535
// set up logger
36-
if err = logx.SetUp(c.Log.LogConf); err != nil {
37-
logx.Must(err)
38-
}
39-
if c.Log.LogConf.Mode != "console" {
40-
logx.AddWriter(logx.NewWriter(os.Stdout))
41-
}
36+
logx.Must(logx.SetUp(c.Log.LogConf))
4237

4338
// write pb to local
4439
c.Gateway.Upstreams[0].ProtoSets, err = embedx.WriteToLocal(pb.Embed, embedx.WithFileMatchFunc(func(path string) bool {

cmd/jzero/.template/frame/gateway/app/etc/etc.yaml.tpl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@ gateway:
1212
name: {{ .APP }}.gw
1313

1414
log:
15-
encoding: plain
15+
serviceName: {{ .APP }}
16+
encoding: plain
17+
level: info
18+
mode: console

cmd/jzero/.template/frame/rpc/app/.gitignore.tpl

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
# Go workspace file
2121
go.work
22+
go.work.sum
2223

2324
# idea
2425
.idea
@@ -27,10 +28,4 @@ go.work
2728
.vscode
2829

2930
# logs
30-
logs
31-
32-
# goreleaser output
33-
dist
34-
35-
# unix sock
36-
*.sock
31+
logs

cmd/jzero/.template/frame/rpc/app/cmd/server.go.tpl

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,7 @@ var serverCmd = &cobra.Command{
2929
logx.Must(err)
3030

3131
// set up logger
32-
if err := logx.SetUp(c.Log.LogConf); err != nil {
33-
logx.Must(err)
34-
}
35-
if c.Log.LogConf.Mode != "console" {
36-
logx.AddWriter(logx.NewWriter(os.Stdout))
37-
}
32+
logx.Must(logx.SetUp(c.Log.LogConf))
3833

3934
svcCtx := svc.NewServiceContext(cc)
4035
run(svcCtx)

cmd/jzero/.template/frame/rpc/app/etc/etc.yaml.tpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ zrpc:
44
name: {{ .APP }}.rpc
55

66
log:
7+
serviceName: {{ .APP }}
78
encoding: plain
9+
level: info
10+
mode: console

0 commit comments

Comments
 (0)