Skip to content

Commit 7c1d41e

Browse files
committed
fix(all): do not os.Exit(1) in wire code.
1 parent ffb2057 commit 7c1d41e

File tree

21 files changed

+72
-60
lines changed

21 files changed

+72
-60
lines changed

Taskfile.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,15 @@ tasks:
2121
cmds:
2222
- cmd: dagger call test --root=.
2323
- cmd: ./scripts/test.sh
24+
25+
generate:
26+
desc: "Run go generate ./... in all packages."
27+
cmds:
28+
- |
29+
for i in $(find . -type d); do
30+
[[ ! -f $i/go.mod ]] && continue
31+
pushd $i 1>/dev/null
32+
echo $i
33+
go generate ./... || true
34+
popd 1>/dev/null
35+
done

benchmarks/event/cmd/handler/wire.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ func wireRun(
5959
for _, c := range types.Components.Iterate(false) {
6060
err := c.Start()
6161
if err != nil {
62-
logger.Error("Failed to start", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
63-
os.Exit(1)
62+
logger.Error("Failed to start", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
63+
return "", err
6464
}
6565
}
6666

@@ -77,7 +77,7 @@ func wireRun(
7777
for _, c := range types.Components.Iterate(true) {
7878
err := c.Stop(ctx)
7979
if err != nil {
80-
logger.Error("Failed to stop", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
80+
logger.Error("Failed to stop", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
8181
}
8282
}
8383

benchmarks/event/cmd/handler/wire_gen.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

benchmarks/event/cmd/request/wire.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ func wireRun(
5858
for _, c := range types.Components.Iterate(false) {
5959
err := c.Start()
6060
if err != nil {
61-
logger.Error("Failed to start", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
62-
os.Exit(1)
61+
logger.Error("Failed to start", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
62+
return "", err
6363
}
6464
}
6565

@@ -76,7 +76,7 @@ func wireRun(
7676
for _, c := range types.Components.Iterate(true) {
7777
err := c.Stop(ctx)
7878
if err != nil {
79-
logger.Error("Failed to stop", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
79+
logger.Error("Failed to stop", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
8080
}
8181
}
8282

benchmarks/event/cmd/request/wire_gen.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

benchmarks/rps/cmd/orb-rps-client/wire.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ func wireRun(
5858
for _, c := range types.Components.Iterate(false) {
5959
err := c.Start()
6060
if err != nil {
61-
logger.Error("Failed to start", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
62-
os.Exit(1)
61+
logger.Error("Failed to start", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
62+
return "", err
6363
}
6464
}
6565

@@ -76,7 +76,7 @@ func wireRun(
7676
for _, c := range types.Components.Iterate(true) {
7777
err := c.Stop(ctx)
7878
if err != nil {
79-
logger.Error("Failed to stop", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
79+
logger.Error("Failed to stop", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
8080
}
8181
}
8282

benchmarks/rps/cmd/orb-rps-client/wire_gen.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

benchmarks/rps/cmd/orb-rps-server/wire.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ func wireRun(
112112
for _, c := range types.Components.Iterate(false) {
113113
err := c.Start()
114114
if err != nil {
115-
logger.Error("Failed to start", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
116-
os.Exit(1)
115+
logger.Error("Failed to start", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
116+
return "", err
117117
}
118118
}
119119

@@ -130,7 +130,7 @@ func wireRun(
130130
for _, c := range types.Components.Iterate(true) {
131131
err := c.Stop(ctx)
132132
if err != nil {
133-
logger.Error("Failed to stop", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
133+
logger.Error("Failed to stop", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
134134
}
135135
}
136136

benchmarks/rps/cmd/orb-rps-server/wire_gen.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

event/simple/cmd/handler/wire.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ func wireRun(
5151
for _, c := range types.Components.Iterate(false) {
5252
err := c.Start()
5353
if err != nil {
54-
logger.Error("Failed to start", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
55-
os.Exit(1)
54+
logger.Error("Failed to start", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
55+
return "", err
5656
}
5757
}
5858

@@ -69,7 +69,7 @@ func wireRun(
6969
for _, c := range types.Components.Iterate(true) {
7070
err := c.Stop(ctx)
7171
if err != nil {
72-
logger.Error("Failed to stop", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
72+
logger.Error("Failed to stop", "error", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
7373
}
7474
}
7575

0 commit comments

Comments
 (0)