git.iko.soy/crush
on main help sign in
fix: improve killing shell children processes
commit97a73a9dd418bc14a33750065157a0b6efebc16a authorCarlos Alexandro Becker <caarlos0@users.noreply.github.com> dateFri 20 Jun 2025, 10:29 (1 year ago) parent1ad3485
4 files changed+48−20
compare with main
unifiedsplit
go.mod+9−1 go.sum+21 internal/fsext/fileutil.go+2−2 internal/llm/tools/shell/shell.go+16−17
go.mod+9−1
@@ -32,7 +32,7 @@ require (
3232 github.com/pressly/goose/v3 v3.24.2
3333 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
3434 github.com/sahilm/fuzzy v0.1.1
35− github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3
35+ github.com/shirou/gopsutil/v4 v4.25.5
3636 github.com/spf13/cobra v1.9.1
3737 github.com/spf13/viper v1.20.0
3838 github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c
@@ -75,9 +75,11 @@ require (
7575 github.com/disintegration/gift v1.1.2 // indirect
7676 github.com/dlclark/regexp2 v1.11.4 // indirect
7777 github.com/dustin/go-humanize v1.0.1 // indirect
78+ github.com/ebitengine/purego v0.8.4 // indirect
7879 github.com/felixge/httpsnoop v1.0.4 // indirect
7980 github.com/go-logr/logr v1.4.2 // indirect
8081 github.com/go-logr/stdr v1.2.2 // indirect
82+ github.com/go-ole/go-ole v1.2.6 // indirect
8183 github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
8284 github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
8385 github.com/google/go-cmp v0.7.0 // indirect
@@ -89,6 +91,7 @@ require (
8991 github.com/inconshreveable/mousetrap v1.1.0 // indirect
9092 github.com/kylelemons/godebug v1.1.0 // indirect
9193 github.com/lucasb-eyer/go-colorful v1.2.0
94+ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
9295 github.com/mattn/go-isatty v0.0.20 // indirect
9396 github.com/mattn/go-runewidth v0.0.16 // indirect
9497 github.com/mfridman/interpolate v0.0.2 // indirect
@@ -102,9 +105,11 @@ require (
102105 github.com/pelletier/go-toml/v2 v2.2.3 // indirect
103106 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
104107 github.com/pmezard/go-difflib v1.0.0 // indirect
108+ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
105109 github.com/rivo/uniseg v0.4.7
106110 github.com/rogpeppe/go-internal v1.14.1 // indirect
107111 github.com/sagikazarmark/locafero v0.7.0 // indirect
112+ github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
108113 github.com/sethvargo/go-retry v0.3.0 // indirect
109114 github.com/sourcegraph/conc v0.3.0 // indirect
110115 github.com/spf13/afero v1.12.0 // indirect
@@ -116,10 +121,13 @@ require (
116121 github.com/tidwall/match v1.1.1 // indirect
117122 github.com/tidwall/pretty v1.2.1 // indirect
118123 github.com/tidwall/sjson v1.2.5 // indirect
124+ github.com/tklauser/go-sysconf v0.3.12 // indirect
125+ github.com/tklauser/numcpus v0.6.1 // indirect
119126 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
120127 github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
121128 github.com/yuin/goldmark v1.7.8 // indirect
122129 github.com/yuin/goldmark-emoji v1.0.5 // indirect
130+ github.com/yusufpapurcu/wmi v1.2.4 // indirect
123131 go.opentelemetry.io/auto/sdk v1.1.0 // indirect
124132 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
125133 go.opentelemetry.io/otel v1.35.0 // indirect
go.sum+21
@@ -108,6 +108,8 @@ github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yA
108108github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
109109github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
110110github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
111+github.com/ebitengine/purego v0.8.4 h1:CF7LEKg5FFOsASUj0+QwaXf8Ht6TlFxg09+S9wz0omw=
112+github.com/ebitengine/purego v0.8.4/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
111113github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
112114github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
113115github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
@@ -121,12 +123,15 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
121123github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
122124github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
123125github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
126+github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
127+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
124128github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
125129github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
126130github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
127131github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
128132github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
129133github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
134+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
130135github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
131136github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
132137github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM=
@@ -156,6 +161,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
156161github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
157162github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
158163github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
164+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
165+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
159166github.com/mark3labs/mcp-go v0.17.0 h1:5Ps6T7qXr7De/2QTqs9h6BKeZ/qdeUeGrgM5lPzi930=
160167github.com/mark3labs/mcp-go v0.17.0/go.mod h1:KmJndYv7GIgcPVwEKJjNcbhVQ+hJGJhrCCB/9xITzpE=
161168github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@@ -195,6 +202,8 @@ github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjL
195202github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
196203github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
197204github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
205+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
206+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
198207github.com/pressly/goose/v3 v3.24.2 h1:c/ie0Gm8rnIVKvnDQ/scHErv46jrDv9b4I0WRcFJzYU=
199208github.com/pressly/goose/v3 v3.24.2/go.mod h1:kjefwFB0eR4w30Td2Gj2Mznyw94vSP+2jJYkOVNbD1k=
200209github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
@@ -219,6 +228,8 @@ github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN
219228github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
220229github.com/sethvargo/go-retry v0.3.0 h1:EEt31A35QhrcRZtrYFDTBg91cqZVnFL2navjDrah2SE=
221230github.com/sethvargo/go-retry v0.3.0/go.mod h1:mNX17F0C/HguQMyMyJxcnU471gOZGxCLyYaFyAZraas=
231+github.com/shirou/gopsutil/v4 v4.25.5 h1:rtd9piuSMGeU8g1RMXjZs9y9luK5BwtnG7dZaQUJAsc=
232+github.com/shirou/gopsutil/v4 v4.25.5/go.mod h1:PfybzyydfZcN+JMMjkF6Zb8Mq1A/VcogFFg7hj50W9c=
222233github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
223234github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
224235github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs=
@@ -255,6 +266,10 @@ github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
255266github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
256267github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
257268github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
269+github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
270+github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
271+github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
272+github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
258273github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
259274github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
260275github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
@@ -265,6 +280,8 @@ github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
265280github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
266281github.com/yuin/goldmark-emoji v1.0.5 h1:EMVWyCGPlXJfUXBXpuMu+ii3TIaxbVBnEX9uaDC4cIk=
267282github.com/yuin/goldmark-emoji v1.0.5/go.mod h1:tTkZEbwu5wkPmgTcitqddVxY9osFZiavD+r4AzQrh1U=
283+github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
284+github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
268285go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
269286go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
270287go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk=
@@ -311,7 +328,9 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
311328golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
312329golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
313330golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
331+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
314332golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
333+golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
315334golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
316335golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
317336golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -320,6 +339,7 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
320339golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
321340golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
322341golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
342+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
323343golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
324344golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
325345golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
@@ -347,6 +367,7 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
347367golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
348368golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
349369golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
370+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
350371google.golang.org/genai v1.3.0 h1:tXhPJF30skOjnnDY7ZnjK3q7IKy4PuAlEA0fk7uEaEI=
351372google.golang.org/genai v1.3.0/go.mod h1:TyfOKRz/QyCaj6f/ZDt505x+YreXnY40l2I6k8TvgqY=
352373google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 h1:e0AIkUUhxyBKh6ssZNrAMeqhA7RKUj42346d1y02i2g=
internal/fsext/fileutil.go+2−2
@@ -99,8 +99,8 @@ func SkipHidden(path string) bool {
9999 "jspm_packages": true,
100100 }
101101
102− parts := strings.Split(path, string(os.PathSeparator))
103− for _, part := range parts {
102+ parts := strings.SplitSeq(path, string(os.PathSeparator))
103+ for part := range parts {
104104 if commonIgnoredDirs[part] {
105105 return true
106106 }
internal/llm/tools/shell/shell.go+16−17
@@ -14,6 +14,8 @@ import (
1414 "time"
1515
1616 "github.com/charmbracelet/crush/internal/config"
17+ "github.com/charmbracelet/crush/internal/logging"
18+ "github.com/shirou/gopsutil/v4/process"
1719)
1820
1921type PersistentShell struct {
@@ -216,10 +218,7 @@ echo $EXEC_EXIT_CODE > %s
216218
217219 // Exponential backoff to reduce CPU usage for longer-running commands
218220 if pollInterval < maxPollInterval {
219− pollInterval = time.Duration(float64(pollInterval) * 1.5)
220− if pollInterval > maxPollInterval {
221− pollInterval = maxPollInterval
222− }
221+ pollInterval = min(time.Duration(float64(pollInterval)*1.5), maxPollInterval)
223222 ticker.Reset(pollInterval)
224223 }
225224 }
@@ -257,23 +256,21 @@ func (s *PersistentShell) killChildren() {
257256 if s.cmd == nil || s.cmd.Process == nil {
258257 return
259258 }
259+ p, err := process.NewProcess(int32(s.cmd.Process.Pid))
260+ if err != nil {
261+ logging.WarnPersist("could not kill persistent shell child processes", "err", err)
262+ return
263+ }
260264
261− pgrepCmd := exec.Command("pgrep", "-P", fmt.Sprintf("%d", s.cmd.Process.Pid))
262− output, err := pgrepCmd.Output()
265+ children, err := p.Children()
263266 if err != nil {
267+ logging.WarnPersist("could not kill persistent shell child processes", "err", err)
264268 return
265269 }
266270
267− for pidStr := range strings.SplitSeq(string(output), "\n") {
268− if pidStr = strings.TrimSpace(pidStr); pidStr != "" {
269− var pid int
270− fmt.Sscanf(pidStr, "%d", &pid)
271− if pid > 0 {
272− proc, err := os.FindProcess(pid)
273− if err == nil {
274− proc.Signal(syscall.SIGTERM)
275− }
276− }
271+ for _, child := range children {
272+ if err := child.SendSignal(syscall.SIGTERM); err != nil {
273+ logging.WarnPersist("could not kill persistent shell child processes", "err", err, "pid", child.Pid)
277274 }
278275 }
279276}
@@ -307,7 +304,9 @@ func (s *PersistentShell) Close() {
307304
308305 s.stdin.Write([]byte("exit\n"))
309306
310− s.cmd.Process.Kill()
307+ if err := s.cmd.Process.Kill(); err != nil {
308+ logging.WarnPersist("could not kill persistent shell", "err", err)
309+ }
311310 s.isAlive = false
312311}
313312