Skip to content

Commit d6fde9f

Browse files
LinuxSuRenLinuxSuRen
authored
fix: the extension might not quit normally (#302)
Co-authored-by: rick <[email protected]>
1 parent 19da5cd commit d6fde9f

File tree

18 files changed

+25
-23
lines changed

18 files changed

+25
-23
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
[![CLA assistant](https://cla-assistant.io/readme/badge/LinuxSuRen/api-testing)](https://cla-assistant.io/LinuxSuRen/api-testing)
12
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/3f16717cd6f841118006f12c346e9341)](https://app.codacy.com/gh/LinuxSuRen/api-testing/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
23
[![Codacy Badge](https://app.codacy.com/project/badge/Coverage/3f16717cd6f841118006f12c346e9341)](https://app.codacy.com/gh/LinuxSuRen/api-testing/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
34
![GitHub All Releases](https://img.shields.io/github/downloads/linuxsuren/api-testing/total)

‎cmd/run.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ See also https://github.com/LinuxSuRen/api-testing/tree/master/sample`,
124124
}
125125

126126
func (o *runOption) preRunE(cmd *cobra.Command, args []string) (err error) {
127+
o.context = cmd.Context()
127128
writer := cmd.OutOrStdout()
128129

129130
if o.reportFile != "" && !strings.HasPrefix(o.reportFile, "http://") && !strings.HasPrefix(o.reportFile, "https://") {
@@ -191,7 +192,7 @@ func (o *runOption) startMonitor() (err error) {
191192
sockFile := os.ExpandEnv(fmt.Sprintf("$HOME/.config/atest/%s.sock", "atest-monitor-docker"))
192193
os.MkdirAll(filepath.Dir(sockFile), 0755)
193194

194-
execer := fakeruntime.DefaultExecer{}
195+
execer := fakeruntime.NewDefaultExecerWithContext(o.context)
195196
go func(socketURL, plugin string) {
196197
if err = execer.RunCommandWithIO(plugin, "", os.Stdout, os.Stderr, "server", "--socket", socketURL); err != nil {
197198
log.Printf("failed to start %s, error: %v", socketURL, err)
@@ -216,7 +217,6 @@ func (o *runOption) startMonitor() (err error) {
216217

217218
func (o *runOption) runE(cmd *cobra.Command, args []string) (err error) {
218219
o.startTime = time.Now()
219-
o.context = cmd.Context()
220220
o.limiter = limit.NewDefaultRateLimiter(o.qps, o.burst)
221221
defer func() {
222222
cmd.Printf("\nconsume: %s\n", time.Since(o.startTime).String())

‎cmd/server.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ type serverOption struct {
125125
}
126126

127127
func (o *serverOption) preRunE(cmd *cobra.Command, args []string) (err error) {
128+
o.execer.WithContext(cmd.Context())
128129
var grpcOpts []grpc.ServerOption
129130

130131
if o.auth == "oauth" {

‎extensions/store-etcd/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
github.com/json-iterator/go v1.1.12 // indirect
4747
github.com/klauspost/compress v1.15.9 // indirect
4848
github.com/lestrrat-go/strftime v1.0.6 // indirect
49-
github.com/linuxsuren/go-fake-runtime v0.0.1 // indirect
49+
github.com/linuxsuren/go-fake-runtime v0.0.3-0.20231202091833-f1e4aceb5638 // indirect
5050
github.com/linuxsuren/unstructured v0.0.1 // indirect
5151
github.com/magiconair/properties v1.8.6 // indirect
5252
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect

‎extensions/store-etcd/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -842,8 +842,8 @@ github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2t
842842
github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
843843
github.com/lestrrat-go/strftime v1.0.6 h1:CFGsDEt1pOpFNU+TJB0nhz9jl+K0hZSLE205AhTIGQQ=
844844
github.com/lestrrat-go/strftime v1.0.6/go.mod h1:f7jQKgV5nnJpYgdEasS+/y7EsTb8ykN2z68n3TtcTaw=
845-
github.com/linuxsuren/go-fake-runtime v0.0.1 h1:ByXNvKgn5g+qnvS4KJIq/OP/fA3qCMRGxwlxsU6Weh8=
846-
github.com/linuxsuren/go-fake-runtime v0.0.1/go.mod h1:zmh6J78hSnWZo68faMA2eKOdaEp8eFbERHi3ZB9xHCQ=
845+
github.com/linuxsuren/go-fake-runtime v0.0.3-0.20231202091833-f1e4aceb5638 h1:4gfAkFURZJMne11sE8OFQJm0UHVNS887296Kp7qWhc8=
846+
github.com/linuxsuren/go-fake-runtime v0.0.3-0.20231202091833-f1e4aceb5638/go.mod h1:zmh6J78hSnWZo68faMA2eKOdaEp8eFbERHi3ZB9xHCQ=
847847
github.com/linuxsuren/unstructured v0.0.1 h1:ilUA8MUYbR6l9ebo/YPV2bKqlf62bzQursDSE+j00iU=
848848
github.com/linuxsuren/unstructured v0.0.1/go.mod h1:KH6aTj+FegzGBzc1vS6mzZx3/duhTUTEVyW5sO7p4as=
849849
github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=

‎extensions/store-git/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ require (
7878
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7979
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
8080
github.com/kevinburke/ssh_config v1.2.0 // indirect
81-
github.com/linuxsuren/go-fake-runtime v0.0.1 // indirect
81+
github.com/linuxsuren/go-fake-runtime v0.0.3-0.20231202091833-f1e4aceb5638 // indirect
8282
github.com/linuxsuren/unstructured v0.0.1 // indirect
8383
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8484
github.com/mitchellh/copystructure v1.0.0 // indirect

‎extensions/store-git/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2t
232232
github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
233233
github.com/lestrrat-go/strftime v1.0.6 h1:CFGsDEt1pOpFNU+TJB0nhz9jl+K0hZSLE205AhTIGQQ=
234234
github.com/lestrrat-go/strftime v1.0.6/go.mod h1:f7jQKgV5nnJpYgdEasS+/y7EsTb8ykN2z68n3TtcTaw=
235-
github.com/linuxsuren/go-fake-runtime v0.0.1 h1:ByXNvKgn5g+qnvS4KJIq/OP/fA3qCMRGxwlxsU6Weh8=
236-
github.com/linuxsuren/go-fake-runtime v0.0.1/go.mod h1:zmh6J78hSnWZo68faMA2eKOdaEp8eFbERHi3ZB9xHCQ=
235+
github.com/linuxsuren/go-fake-runtime v0.0.3-0.20231202091833-f1e4aceb5638 h1:4gfAkFURZJMne11sE8OFQJm0UHVNS887296Kp7qWhc8=
236+
github.com/linuxsuren/go-fake-runtime v0.0.3-0.20231202091833-f1e4aceb5638/go.mod h1:zmh6J78hSnWZo68faMA2eKOdaEp8eFbERHi3ZB9xHCQ=
237237
github.com/linuxsuren/unstructured v0.0.1 h1:ilUA8MUYbR6l9ebo/YPV2bKqlf62bzQursDSE+j00iU=
238238
github.com/linuxsuren/unstructured v0.0.1/go.mod h1:KH6aTj+FegzGBzc1vS6mzZx3/duhTUTEVyW5sO7p4as=
239239
github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=

‎extensions/store-mongodb/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ require (
3838
github.com/json-iterator/go v1.1.12 // indirect
3939
github.com/klauspost/compress v1.15.9 // indirect
4040
github.com/lestrrat-go/strftime v1.0.6 // indirect
41-
github.com/linuxsuren/go-fake-runtime v0.0.1 // indirect
41+
github.com/linuxsuren/go-fake-runtime v0.0.3-0.20231202091833-f1e4aceb5638 // indirect
4242
github.com/linuxsuren/unstructured v0.0.1 // indirect
4343
github.com/magiconair/properties v1.8.6 // indirect
4444
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect

‎extensions/store-mongodb/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2t
202202
github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
203203
github.com/lestrrat-go/strftime v1.0.6 h1:CFGsDEt1pOpFNU+TJB0nhz9jl+K0hZSLE205AhTIGQQ=
204204
github.com/lestrrat-go/strftime v1.0.6/go.mod h1:f7jQKgV5nnJpYgdEasS+/y7EsTb8ykN2z68n3TtcTaw=
205-
github.com/linuxsuren/go-fake-runtime v0.0.1 h1:ByXNvKgn5g+qnvS4KJIq/OP/fA3qCMRGxwlxsU6Weh8=
206-
github.com/linuxsuren/go-fake-runtime v0.0.1/go.mod h1:zmh6J78hSnWZo68faMA2eKOdaEp8eFbERHi3ZB9xHCQ=
205+
github.com/linuxsuren/go-fake-runtime v0.0.3-0.20231202091833-f1e4aceb5638 h1:4gfAkFURZJMne11sE8OFQJm0UHVNS887296Kp7qWhc8=
206+
github.com/linuxsuren/go-fake-runtime v0.0.3-0.20231202091833-f1e4aceb5638/go.mod h1:zmh6J78hSnWZo68faMA2eKOdaEp8eFbERHi3ZB9xHCQ=
207207
github.com/linuxsuren/unstructured v0.0.1 h1:ilUA8MUYbR6l9ebo/YPV2bKqlf62bzQursDSE+j00iU=
208208
github.com/linuxsuren/unstructured v0.0.1/go.mod h1:KH6aTj+FegzGBzc1vS6mzZx3/duhTUTEVyW5sO7p4as=
209209
github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=

‎extensions/store-orm/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ require (
4848
github.com/json-iterator/go v1.1.12 // indirect
4949
github.com/klauspost/compress v1.16.0 // indirect
5050
github.com/lestrrat-go/strftime v1.0.6 // indirect
51-
github.com/linuxsuren/go-fake-runtime v0.0.1 // indirect
51+
github.com/linuxsuren/go-fake-runtime v0.0.3-0.20231202091833-f1e4aceb5638 // indirect
5252
github.com/linuxsuren/unstructured v0.0.1 // indirect
5353
github.com/magiconair/properties v1.8.6 // indirect
5454
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect

0 commit comments

Comments
 (0)