From 14c99d619f0f2122ff69fa34ebc7bee0493e5d74 Mon Sep 17 00:00:00 2001 From: wsfuyibing Date: Sat, 13 Jul 2024 17:02:30 +0800 Subject: [PATCH 1/2] with log --- examples/simple/config/app.yaml | 4 ++ examples/simple/config/log.yaml | 6 ++ examples/simple/main.go | 12 ++-- go.mod | 32 +++++++++- go.sum | 105 ++++++++++++++++++++++++++++++++ src/process.go | 41 +++++++++++-- 6 files changed, 186 insertions(+), 14 deletions(-) create mode 100644 examples/simple/config/app.yaml create mode 100644 examples/simple/config/log.yaml diff --git a/examples/simple/config/app.yaml b/examples/simple/config/app.yaml new file mode 100644 index 0000000..f6e3c28 --- /dev/null +++ b/examples/simple/config/app.yaml @@ -0,0 +1,4 @@ +name: "example" +version: "1.0.0" +host: "" +port: 8080 diff --git a/examples/simple/config/log.yaml b/examples/simple/config/log.yaml new file mode 100644 index 0000000..470f1cc --- /dev/null +++ b/examples/simple/config/log.yaml @@ -0,0 +1,6 @@ +level: debug +time-format: "2006-01-02T15:04:05.999999999Z07:00" +adapter: term +term-adapter: + color: true +tracer: "" diff --git a/examples/simple/main.go b/examples/simple/main.go index 496e48c..539af6b 100644 --- a/examples/simple/main.go +++ b/examples/simple/main.go @@ -26,10 +26,11 @@ type my struct { name string } -func (o *my) After(ctx context.Context) (err error) { println(o.name, ":", "done"); return nil } +func (o *my) After(ctx context.Context) (err error) { + return nil +} func (o *my) Run(ctx context.Context) (err error) { - println(o.name, ":", "run") for { select { case <-ctx.Done(): @@ -58,15 +59,12 @@ func main() { return } - println("----") - cn := fmt.Sprintf(`ch-%d`, i) - ch := process.New(cn, &my{name: cn}).Prevent(true) - proc.Add(ch) // .Restart() + ch := process.New(cn, &my{name: cn}) // .Prevent(true) + proc.Add(ch) // .Restart() } time.Sleep(time.Second * 3) - println("----") proc.Stop() }() diff --git a/go.mod b/go.mod index 2d7372c..672e391 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,34 @@ module gitee.com/go-libs/process go 1.18 -require github.com/google/uuid v1.6.0 +require ( + gitee.com/go-wares/log v0.1.10 + github.com/google/uuid v1.6.0 +) + +require ( + github.com/IBM/sarama v1.43.1 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/eapache/go-resiliency v1.6.0 // indirect + github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect + github.com/eapache/queue v1.1.0 // indirect + github.com/elastic/go-elasticsearch/v7 v7.17.10 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/go-uuid v1.0.3 // indirect + github.com/jcmturner/aescts/v2 v2.0.0 // indirect + github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect + github.com/jcmturner/gofork v1.7.6 // indirect + github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect + github.com/jcmturner/rpc/v2 v2.0.3 // indirect + github.com/klauspost/compress v1.17.7 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect + github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasthttp v1.52.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/go.sum b/go.sum index 7790d7c..187a724 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,107 @@ +gitee.com/go-wares/log v0.1.10 h1:DGvvH6DOF8YXLcBTqABGGhkrwe+OhmD3sV9W6NHcB4E= +gitee.com/go-wares/log v0.1.10/go.mod h1:HDs8rnqgyYDGzrUM+SNJx6/R1MK7JpKG5jqAY1HIW/o= +github.com/IBM/sarama v1.43.1 h1:Z5uz65Px7f4DhI/jQqEm/tV9t8aU+JUdTyW/K/fCXpA= +github.com/IBM/sarama v1.43.1/go.mod h1:GG5q1RURtDNPz8xxJs3mgX6Ytak8Z9eLhAkJPObe2xE= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/eapache/go-resiliency v1.6.0 h1:CqGDTLtpwuWKn6Nj3uNUdflaq+/kIPsg0gfNzHton30= +github.com/eapache/go-resiliency v1.6.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= +github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws= +github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= +github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/elastic/go-elasticsearch/v7 v7.17.10 h1:TCQ8i4PmIJuBunvBS6bwT2ybzVFxxUhhltAs3Gyu1yo= +github.com/elastic/go-elasticsearch/v7 v7.17.10/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4= +github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= +github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= +github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= +github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= +github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= +github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= +github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg= +github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= +github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= +github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= +github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8= +github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= +github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= +github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= +github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= +github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.52.0 h1:wqBQpxH71XW0e2g+Og4dzQM8pk34aFYlA1Ga8db7gU0= +github.com/valyala/fasthttp v1.52.0/go.mod h1:hf5C4QnVMkNXMspnsUlfM3WitlgYflyhHYoKol/szxQ= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/src/process.go b/src/process.go index 0038631..60fb7ad 100644 --- a/src/process.go +++ b/src/process.go @@ -18,6 +18,7 @@ package src import ( "context" "fmt" + "gitee.com/go-wares/log" "github.com/google/uuid" "sync" "time" @@ -94,13 +95,18 @@ type ( ) // New -// creates new process instance. +// creates a new process instance. func New(name string, provider Provider) Process { + if log.Config().DebugOn() { + log.Debugf(`[process=%s] created`, name) + } + return &process{ - mu: new(sync.RWMutex), name: name, uid: uuid.NewString(), - provider: provider, + + mu: new(sync.RWMutex), children: make(map[string]Process), + provider: provider, } } @@ -123,6 +129,7 @@ func (o *process) Add(children ...Process) Process { defer o.mu.RUnlock() if p, ok := o.children[child.GetName()]; ok { + log.Warnf(`[process=%s] stop child process with the same name: name="%s"`, o.name, child.GetName()) p.Stop() } }() @@ -137,6 +144,10 @@ func (o *process) Add(children ...Process) Process { o.mu.Lock() o.children[child.GetName()] = child o.mu.Unlock() + + if log.Config().DebugOn() { + log.Debugf(`[process=%s] add child process: child="%s"`, o.name, child.GetName()) + } } // Recall @@ -163,6 +174,9 @@ func (o *process) Del(children ...Process) Process { // Delete // child from current process with same name and unique id are equals. if p, ok := o.children[child.GetName()]; ok && child.GetUid() == p.GetUid() { + if log.Config().DebugOn() { + log.Debugf(`[process=%s] remove child process: child="%s"`, o.name, child.GetName()) + } delete(o.children, child.GetName()) } } @@ -230,6 +244,8 @@ func (o *process) Start(ctx context.Context) (err error) { if ctx == nil { o.mu.Unlock() err = ErrNilContext + + log.Warnf(`[process=%s] stop error: why="%v"`, o.name, err) return } @@ -238,6 +254,8 @@ func (o *process) Start(ctx context.Context) (err error) { if o.started { o.mu.Unlock() err = ErrStartedAlready + + log.Warnf(`[process=%s] stop error: why="%v"`, o.name, err) return } @@ -265,6 +283,9 @@ func (o *process) Start(ctx context.Context) (err error) { o.ctx, o.cancel = nil, nil o.started = false o.mu.Unlock() + if log.Config().DebugOn() { + log.Debugf(`[process=%s] stopped`, o.name) + } // Remove // from parent if not prevented. @@ -294,10 +315,15 @@ func (o *process) Start(ctx context.Context) (err error) { o.ctx, o.cancel = context.WithCancel(ctx) o.mu.Unlock() + if log.Config().DebugOn() { + log.Debugf(`[process=%s] started`, o.name) + } + // Do before // callback in provider. Continue next loop if error returned. if v, ok := o.provider.(ProviderBefore); ok { - if o.doCallback(v.Before) != nil { + if ve := o.doCallback(v.Before); ve != nil { + log.Warnf(`[process=%s] call before callback error: why="%v"`, o.name, ve) continue } } @@ -308,7 +334,8 @@ func (o *process) Start(ctx context.Context) (err error) { // Call runner // callback in provider. - if o.doCallback(o.provider.Run) != nil { + if ve := o.doCallback(o.provider.Run); ve != nil { + log.Warnf(`[process=%s] call runner callback error: why="%v"`, o.name, ve) } // Wait @@ -318,7 +345,8 @@ func (o *process) Start(ctx context.Context) (err error) { // Do after // callback in provider. if v, ok := o.provider.(ProviderAfter); ok { - if o.doCallback(v.After) != nil { + if ve := o.doCallback(v.After); ve != nil { + log.Warnf(`[process=%s] call after callback error: why="%v"`, o.name, ve) } } } @@ -362,6 +390,7 @@ func (o *process) doCallback(callback func(ctx context.Context) error) (err erro // runtime panic into error. defer func() { if r := recover(); r != nil { + log.Fatalf(`[process=%s] callback fatal: error="%v"`, o.name, r) err = fmt.Errorf(`%v`, r) } }() -- Gitee From 7b573275f2ea8c6f7f01add051b966525b133b89 Mon Sep 17 00:00:00 2001 From: wsfuyibing Date: Mon, 15 Jul 2024 10:15:59 +0800 Subject: [PATCH 2/2] update comment --- src/process.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/process.go b/src/process.go index 60fb7ad..439d25a 100644 --- a/src/process.go +++ b/src/process.go @@ -98,7 +98,7 @@ type ( // creates a new process instance. func New(name string, provider Provider) Process { if log.Config().DebugOn() { - log.Debugf(`[process=%s] created`, name) + log.Debugf(`[process=%s] process created`, name) } return &process{ @@ -146,7 +146,7 @@ func (o *process) Add(children ...Process) Process { o.mu.Unlock() if log.Config().DebugOn() { - log.Debugf(`[process=%s] add child process: child="%s"`, o.name, child.GetName()) + log.Debugf(`[process=%s] adds a child process: child="%s"`, o.name, child.GetName()) } } @@ -175,7 +175,7 @@ func (o *process) Del(children ...Process) Process { // child from current process with same name and unique id are equals. if p, ok := o.children[child.GetName()]; ok && child.GetUid() == p.GetUid() { if log.Config().DebugOn() { - log.Debugf(`[process=%s] remove child process: child="%s"`, o.name, child.GetName()) + log.Debugf(`[process=%s] deletes a child process: child="%s"`, o.name, child.GetName()) } delete(o.children, child.GetName()) } @@ -245,7 +245,7 @@ func (o *process) Start(ctx context.Context) (err error) { o.mu.Unlock() err = ErrNilContext - log.Warnf(`[process=%s] stop error: why="%v"`, o.name, err) + log.Warnf(`[process=%s] start process error: why="%v"`, o.name, err) return } @@ -255,7 +255,7 @@ func (o *process) Start(ctx context.Context) (err error) { o.mu.Unlock() err = ErrStartedAlready - log.Warnf(`[process=%s] stop error: why="%v"`, o.name, err) + log.Warnf(`[process=%s] start process error: why="%v"`, o.name, err) return } @@ -316,14 +316,14 @@ func (o *process) Start(ctx context.Context) (err error) { o.mu.Unlock() if log.Config().DebugOn() { - log.Debugf(`[process=%s] started`, o.name) + log.Debugf(`[process=%s] process started`, o.name) } // Do before // callback in provider. Continue next loop if error returned. if v, ok := o.provider.(ProviderBefore); ok { if ve := o.doCallback(v.Before); ve != nil { - log.Warnf(`[process=%s] call before callback error: why="%v"`, o.name, ve) + log.Warnf(`[process=%s] process before called error: why="%v"`, o.name, ve) continue } } @@ -335,7 +335,7 @@ func (o *process) Start(ctx context.Context) (err error) { // Call runner // callback in provider. if ve := o.doCallback(o.provider.Run); ve != nil { - log.Warnf(`[process=%s] call runner callback error: why="%v"`, o.name, ve) + log.Warnf(`[process=%s] process called error: why="%v"`, o.name, ve) } // Wait @@ -346,7 +346,7 @@ func (o *process) Start(ctx context.Context) (err error) { // callback in provider. if v, ok := o.provider.(ProviderAfter); ok { if ve := o.doCallback(v.After); ve != nil { - log.Warnf(`[process=%s] call after callback error: why="%v"`, o.name, ve) + log.Warnf(`[process=%s] process after called error: why="%v"`, o.name, ve) } } } @@ -390,7 +390,7 @@ func (o *process) doCallback(callback func(ctx context.Context) error) (err erro // runtime panic into error. defer func() { if r := recover(); r != nil { - log.Fatalf(`[process=%s] callback fatal: error="%v"`, o.name, r) + log.Fatalf(`[process=%s] process runtime fatal: error="%v"`, o.name, r) err = fmt.Errorf(`%v`, r) } }() -- Gitee