From 828cb2a0c8d99f7dc973cbda31f27e53e02cdd13 Mon Sep 17 00:00:00 2001 From: Wilson de Carvalho <796900+wcmjunior@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:28:13 -0700 Subject: [PATCH 01/10] Bump dependencies and golang --- .github/workflows/ci.yml | 4 +- go.mod | 32 ++-- go.sum | 399 ++++----------------------------------- 3 files changed, 53 insertions(+), 382 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df5e177c..8faa30fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,12 +12,12 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.22 - name: Build run: go build -v ./... diff --git a/go.mod b/go.mod index d18acd27..beabfb74 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,12 @@ module github.com/ochinchina/supervisord -go 1.17 +go 1.22 require ( - github.com/gorilla/mux v1.8.0 - github.com/gorilla/rpc v1.2.0 - github.com/jessevdk/go-flags v1.5.0 - github.com/kardianos/service v1.2.1 + github.com/gorilla/mux v1.8.1 + github.com/gorilla/rpc v1.2.1 + github.com/jessevdk/go-flags v1.6.1 + github.com/kardianos/service v1.2.2 github.com/ochinchina/go-daemon v0.1.5 github.com/ochinchina/go-ini v1.0.1 github.com/ochinchina/go-reaper v0.0.0-20181016012355-6b11389e79fc @@ -20,27 +20,25 @@ require ( github.com/ochinchina/supervisord/types v0.0.0-20220520055329-8fdf6b62a44f github.com/ochinchina/supervisord/util v0.0.0-20220721095143-c2527852d28f github.com/ochinchina/supervisord/xmlrpcclient v0.0.0-20220520055329-8fdf6b62a44f - github.com/prometheus/client_golang v1.12.2 - github.com/sirupsen/logrus v1.9.0 + github.com/prometheus/client_golang v1.20.2 + github.com/sirupsen/logrus v1.9.3 ) require ( github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/hashicorp/go-envparse v0.1.0 // indirect github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/klauspost/compress v1.17.9 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/ochinchina/filechangemonitor v0.3.1 // indirect - github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.37.0 // indirect - github.com/prometheus/procfs v0.7.3 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.58.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/rogpeppe/go-charset v0.0.0-20190617161244-0dc95cdf6f31 // indirect - github.com/stretchr/testify v1.7.1 // indirect - golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect - google.golang.org/protobuf v1.28.0 // indirect - gopkg.in/yaml.v3 v3.0.0 // indirect + golang.org/x/sys v0.25.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect ) replace ( diff --git a/go.sum b/go.sum index 51ba4840..cb40bb88 100644 --- a/go.sum +++ b/go.sum @@ -1,38 +1,4 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -42,126 +8,74 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= 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/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/rpc v1.2.0 h1:WvvdC2lNeT1SP32zrIce5l0ECBfbAlmrmSBsuc57wfk= +github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= +github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/rpc v1.2.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ= +github.com/gorilla/rpc v1.2.1 h1:yC+LMV5esttgpVvNORL/xX4jvTTEUE30UZhZ5JF7K9k= +github.com/gorilla/rpc v1.2.1/go.mod h1:uNpOihAlF5xRFLuTYhfR0yfCTm0WTQSQttkMSptRfGk= github.com/hashicorp/go-envparse v0.1.0 h1:bE++6bhIsNCPLvgDZkYqo3nA+/PFI51pkrHdmPSDFPY= github.com/hashicorp/go-envparse v0.1.0/go.mod h1:OHheN1GoygLlAkTlXLXvAdnXdZxy8JUweQ1rAXx1xnc= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= -github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= +github.com/jessevdk/go-flags v1.6.1 h1:Cvu5U8UGrLay1rZfv/zP7iLpSHGUZ/Ou68T0iX1bBK4= +github.com/jessevdk/go-flags v1.6.1/go.mod h1:Mk8T1hIAWpOiJiHa9rJASDK2UGWji0EuPGBnNLMooyc= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA= github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= -github.com/kardianos/service v1.2.1 h1:AYndMsehS+ywIS6RB9KOlcXzteWUzxgMgBymJD7+BYk= -github.com/kardianos/service v1.2.1/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kardianos/service v1.2.2 h1:ZvePhAHfvo0A7Mftk/tEzqEZ7Q4lgnR8sGz4xu1YX60= +github.com/kardianos/service v1.2.2/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/ochinchina/filechangemonitor v0.3.1 h1:Fyt8iE44kFwmI3ncNWAi21GZnmRBrAUSlMunpcDlMjQ= @@ -182,336 +96,95 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34= -github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= +github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= -github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/common v0.58.0 h1:N+N8vY4/23r6iYfD3UQZUoJPnUYAo7v6LG5XZxjZTXo= +github.com/prometheus/common v0.58.0/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/go-charset v0.0.0-20190617161244-0dc95cdf6f31 h1:DE4LcMKyqAVa6a0CGmVxANbnVb7stzMmPkQiieyNmfQ= github.com/rogpeppe/go-charset v0.0.0-20190617161244-0dc95cdf6f31/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/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-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= -google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 2bf7af1e4f9e32ab32ca4b66d61ab6f55affa9b4 Mon Sep 17 00:00:00 2001 From: Wilson de Carvalho <796900+wcmjunior@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:28:26 -0700 Subject: [PATCH 02/10] Add dependabot --- .github/workflows/dependabot.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .github/workflows/dependabot.yml diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml new file mode 100644 index 00000000..40b25427 --- /dev/null +++ b/.github/workflows/dependabot.yml @@ -0,0 +1,8 @@ +version: 2 +updates: + - package-ecosystem: "gomod" + directory: "/" + schedule: + interval: "daily" + time: "12:00" + open-pull-requests-limit: 10 \ No newline at end of file From dd39051a48a3473024a61b011183ae1edb781c3e Mon Sep 17 00:00:00 2001 From: Wilson de Carvalho <796900+wcmjunior@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:36:08 -0700 Subject: [PATCH 03/10] Fix EOF --- .github/workflows/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index 40b25427..f74a93c3 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -5,4 +5,4 @@ updates: schedule: interval: "daily" time: "12:00" - open-pull-requests-limit: 10 \ No newline at end of file + open-pull-requests-limit: 10 From 7c3f5514b91b48e18e6d446726c949d33361374d Mon Sep 17 00:00:00 2001 From: Wilson de Carvalho <796900+wcmjunior@users.noreply.github.com> Date: Wed, 4 Sep 2024 16:54:19 -0700 Subject: [PATCH 04/10] Make Docs Great Again --- README.md | 122 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 64 insertions(+), 58 deletions(-) diff --git a/README.md b/README.md index 1178bafb..e5a88172 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Go Report Card](https://goreportcard.com/badge/github.com/ochinchina/supervisord)](https://goreportcard.com/report/github.com/ochinchina/supervisord) +[![Go Report Card](https://goreportcard.com/badge/github.com/cyralinc/supervisord)](https://goreportcard.com/report/github.com/cyralinc/supervisord) # Why this project? @@ -8,20 +8,26 @@ But this tool requires that the big python environment be installed in target sy This project re-implements supervisord in go-lang. Compiled supervisord is very suitable for environments where python is not installed. +# Why we forked it? + +The original project hasn't been actively maintained for one year at the time we forked it. We need to keep it up-to-date and eventually change some things, so why not fork it? :-) + # Building the supervisord -Before compiling the supervisord, make sure the go-lang 1.11+ is installed in your environment. +Before compiling the supervisord, make sure the go-lang 1.22 is installed in your environment. To compile supervisord for **linux**, run following commands: -1. go generate -2. GOOS=linux go build -tags release -a -ldflags "-linkmode external -extldflags -static" -o supervisord +```shell +go generate +GOOS=linux go build -tags release -a -ldflags "-linkmode external -extldflags -static" -o supervisord +``` # Run the supervisord After a supervisord binary has been generated, create a supervisord configuration file and start the supervisord like this: -```Shell +```shell $ cat supervisor.conf [program:test] command = /your/program args @@ -73,7 +79,7 @@ $ supervisord ctl pid $ supervisord ctl fg ``` -Please note that `supervisor ctl` subcommand works correctly only if http server is enabled in [inet_http_server], and **serverurl** correctly set. Unix domain socket is not currently supported for this pupose. +Please note that `supervisor ctl` subcommand works correctly only if http server is enabled in [inet_http_server], and `serverurl` correctly set. Unix domain socket is not currently supported for this pupose. Serverurl parameter detected in the following order: @@ -105,53 +111,53 @@ If both "inet_http_server" and "unix_http_server" are not set up in the configur Following parameters configured in "supervisord" section: -- **logfile**. Where to put log of supervisord itself. -- **logfile_maxbytes**. Rotate log-file after it exceeds this length. -- **logfile_backups**. Number of rotated log-files to preserve. -- **loglevel**. Logging verbosity, can be trace, debug, info, warning, error, fatal and panic (according to documentation of module used for this feature). Defaults to info. -- **pidfile**. Full path to file containing process id of current supervisord instance. -- **minfds**. Reserve al least this amount of file descriptors on supervisord startup. (Rlimit nofiles). -- **minprocs**. Reserve at least this amount of processes resource on supervisord startup. (Rlimit noproc). -- **identifier**. Identifier of this supervisord instance. Required if there is more than one supervisord run on one machine in same namespace. +- `logfile`: Where to put log of supervisord itself. +- `logfile_maxbytes`: Rotate log-file after it exceeds this length. +- `logfile_backups`: Number of rotated log-files to preserve. +- `loglevel`: Logging verbosity, can be trace, debug, info, warning, error, fatal and panic (according to documentation of module used for this feature). Defaults to info. +- `pidfile`: Full path to file containing process id of current supervisord instance. +- `minfds`: Reserve al least this amount of file descriptors on supervisord startup. (Rlimit nofiles). +- `minprocs`: Reserve at least this amount of processes resource on supervisord startup. (Rlimit noproc). +- `identifier`: Identifier of this supervisord instance. Required if there is more than one supervisord run on one machine in same namespace. ## Supervised program settings Supervised program settings configured in [program:programName] section and include these options: -- **command**. Command to supervise. It can be given as full path to executable or can be calculated via PATH variable. Command line parameters also should be supplied in this string. -- **process_name**. the process name -- **numprocs**. number of process -- **numprocs_start**. ?? -- **autostart**. Should be supervised command run on supervisord start? Defaults to **true**. -- **startsecs**. The total number of seconds which the program needs to stay running after a startup to consider the start successful (moving the process from the STARTING state to the RUNNING state). Set to 0 to indicate that the program needn’t stay running for any particular amount of time. -- **startretries**. The number of serial failure attempts that supervisord will allow when attempting to start the program before giving up and putting the process into an FATAL state. See Process States for explanation of the FATAL state. -- **autorestart**. Automatically re-run supervised command if it dies. -- **exitcodes**. The list of “expected” exit codes for this program used with autorestart. If the autorestart parameter is set to unexpected, and the process exits in any other way than as a result of a supervisor stop request, supervisord will restart the process if it exits with an exit code that is not defined in this list. -- **stopsignal**. Signal to send to command to gracefully stop it. If more than one stopsignal is configured, when stoping the program, the supervisor will send the signals to the program one by one with interval "stopwaitsecs". If the program does not exit after all the signals sent to the program, supervisord will kill the program. -- **stopwaitsecs**. Amount of time to wait before sending SIGKILL to supervised command to make it stop ungracefully. -- **stdout_logfile**. Where STDOUT of supervised command should be redirected. (Particular values described lower in this file). -- **stdout_logfile_maxbytes**. Log size after exceed which log will be rotated. -- **stdout_logfile_backups**. Number of rotated log-files to preserve. -- **redirect_stderr**. Should STDERR be redirected to STDOUT. -- **stderr_logfile**. Where STDERR of supervised command should be redirected. (Particular values described lower in this file). -- **stderr_logfile_maxbytes**. Log size after exceed which log will be rotated. -- **stderr_logfile_backups**. Number of rotated log-files to preserve. -- **environment**. List of VARIABLE=value to be passed to supervised program. It has higher priority than `envFiles`. -- **envFiles**. List of .env files to be loaded and passed to supervised program. -- **priority**. The relative priority of the program in the start and shutdown ordering -- **user**. Sudo to this USER or USER:GROUP right before exec supervised command. -- **directory**. Jump to this path and exec supervised command there. -- **stopasgroup**. Also stop this program when stopping group of programs where this program is listed. -- **killasgroup**. Also kill this program when stopping group of programs where this program is listed. -- **restartpause**. Wait (at least) this amount of seconds after stpping suprevised program before strt it again. -- **restart_when_binary_changed**. Boolean value (false or true) to control if the supervised command should be restarted when its executable binary changes. Defaults to false. -- **restart_cmd_when_binary_changed**. The command to restart the program if the program binary itself is changed. -- **restart_signal_when_binary_changed**. The signal sent to the program for restarting if the program binary is changed. -- **restart_directory_monitor**. Path to be monitored for restarting purpose. -- **restart_file_pattern**. If a file changes under restart_directory_monitor and filename matches this pattern, the supervised command will be restarted. -- **restart_cmd_when_file_changed**. The command to restart the program if any monitored files under **restart_directory_monitor** with pattern **restart_file_pattern** are changed. -- **restart_signal_when_file_changed**. The signal will be sent to the proram, such as Nginx, for restarting if any monitored files under **restart_directory_monitor** with pattern **restart_file_pattern** are changed. -- **depends_on**. Define supervised command start dependency. If program A depends on program B, C, the program B, C will be started before program A. Example: +- `command`: Command to supervise. It can be given as full path to executable or can be calculated via PATH variable. Command line parameters also should be supplied in this string. +- `process_name`: the process name +- `numprocs`: number of process +- `numprocs_start`: ?? +- `autostart`: Should be supervised command run on supervisord start? Defaults to `true`. +- `startsecs`: The total number of seconds which the program needs to stay running after a startup to consider the start successful (moving the process from the STARTING state to the RUNNING state). Set to 0 to indicate that the program needn’t stay running for any particular amount of time. +- `startretries`: The number of serial failure attempts that supervisord will allow when attempting to start the program before giving up and putting the process into an FATAL state. See Process States for explanation of the FATAL state. +- `autorestart`: Automatically re-run supervised command if it dies. +- `exitcodes`: The list of “expected” exit codes for this program used with autorestart. If the autorestart parameter is set to unexpected, and the process exits in any other way than as a result of a supervisor stop request, supervisord will restart the process if it exits with an exit code that is not defined in this list. +- `stopsignal`: Signal to send to command to gracefully stop it. If more than one stopsignal is configured, when stoping the program, the supervisor will send the signals to the program one by one with interval "stopwaitsecs". If the program does not exit after all the signals sent to the program, supervisord will kill the program. +- `stopwaitsecs`: Amount of time to wait before sending SIGKILL to supervised command to make it stop ungracefully. +- `stdout_logfile`: Where STDOUT of supervised command should be redirected. (Particular values described lower in this file). +- `stdout_logfile_maxbytes`: Log size after exceed which log will be rotated. +- `stdout_logfile_backups`: Number of rotated log-files to preserve. +- `redirect_stderr`: Should STDERR be redirected to STDOUT. +- `stderr_logfile`: Where STDERR of supervised command should be redirected. (Particular values described lower in this file). +- `stderr_logfile_maxbytes`: Log size after exceed which log will be rotated. +- `stderr_logfile_backups`: Number of rotated log-files to preserve. +- `environment`: List of VARIABLE=value to be passed to supervised program. It has higher priority than `envFiles`. +- `envFiles`: List of .env files to be loaded and passed to supervised program. +- `priority`: The relative priority of the program in the start and shutdown ordering +- `user`: Sudo to this USER or USER:GROUP right before exec supervised command. +- `directory`: Jump to this path and exec supervised command there. +- `stopasgroup`: Also stop this program when stopping group of programs where this program is listed. +- `killasgroup`: Also kill this program when stopping group of programs where this program is listed. +- `restartpause`: Wait (at least) this amount of seconds after stpping suprevised program before strt it again. +- `restart_when_binary_changed`: Boolean value (false or true) to control if the supervised command should be restarted when its executable binary changes. Defaults to false. +- `restart_cmd_when_binary_changed`: The command to restart the program if the program binary itself is changed. +- `restart_signal_when_binary_changed`: The signal sent to the program for restarting if the program binary is changed. +- `restart_directory_monitor`: Path to be monitored for restarting purpose. +- `restart_file_pattern`: If a file changes under restart_directory_monitor and filename matches this pattern, the supervised command will be restarted. +- `restart_cmd_when_file_changed`: The command to restart the program if any monitored files under `restart_directory_monitor` with pattern `restart_file_pattern` are changed. +- `restart_signal_when_file_changed`: The signal will be sent to the proram, such as Nginx, for restarting if any monitored files under `restart_directory_monitor` with pattern `restart_file_pattern` are changed. +- `depends_on`: Define supervised command start dependency. If program A depends on program B, C, the program B, C will be started before program A. Example: ```ini [program:A] @@ -200,12 +206,12 @@ Supervisord 3.x defined events are supported partially. Now it supports followin Supervisord can redirect stdout and stderr ( fields stdout_logfile, stderr_logfile ) of supervised programs to: -- **/dev/null**. Ignore the log - send it to /dev/null. -- **/dev/stdout**. Write log to STDOUT. -- **/dev/stderr**. Write log to STDERR. -- **syslog**. Send the log to local syslog service. -- **syslog @[protocol:]host[:port]**. Send log events to remote syslog server. Protocol must be "tcp" or "udp", if missing, "udp" assumed. If port is missing, for "udp" protocol, it's defaults to 514 and for "tcp" protocol, it's value is 6514. -- **file name**. Write log to specified file. +- `/dev/null`: Ignore the log - send it to /dev/null. +- `/dev/stdout`: Write log to STDOUT. +- `/dev/stderr`: Write log to STDERR. +- `syslog`: Send the log to local syslog service. +- `syslog @[protocol:]host[:port]`: Send log events to remote syslog server. Protocol must be "tcp" or "udp", if missing, "udp" assumed. If port is missing, for "udp" protocol, it's defaults to 514 and for "tcp" protocol, it's value is 6514. +- `file name`: Write log to specified file. Multiple log files can be configured for the stdout_logfile and stderr_logfile with ',' as delimiter. For example: @@ -222,16 +228,16 @@ syslog_tag=test syslog_stdout_priority=info syslog_stderr_priority=err ``` -- **syslog_facility**, can be one of(case insensitive): KERNEL, USER, MAIL, DAEMON, AUTH, SYSLOG, LPR, NEWS, UUCP, CRON, AUTHPRIV, FTP, LOCAL0~LOCAL7 -- **syslog_stdout_priority**, can be one of(case insensitive): EMERG, ALERT, CRIT, ERR, WARN, NOTICE, INFO, DEBUG -- **syslog_stderr_priority**, can be one of(case insensitive): EMERG, ALERT, CRIT, ERR, WARN, NOTICE, INFO, DEBUG +- `syslog_facility`, can be one of(case insensitive): KERNEL, USER, MAIL, DAEMON, AUTH, SYSLOG, LPR, NEWS, UUCP, CRON, AUTHPRIV, FTP, LOCAL0~LOCAL7 +- `syslog_stdout_priority`, can be one of(case insensitive): EMERG, ALERT, CRIT, ERR, WARN, NOTICE, INFO, DEBUG +- `syslog_stderr_priority`, can be one of(case insensitive): EMERG, ALERT, CRIT, ERR, WARN, NOTICE, INFO, DEBUG # Web GUI Supervisord has builtin web GUI: you can start, stop & check the status of program from the GUI. Following picture shows the default web GUI: -![alt text](https://github.com/ochinchina/supervisord/blob/master/go_supervisord_gui.png) +![alt text](https://github.com/cyralinc/supervisord/blob/master/go_supervisord_gui.png) Please note that in order to see|use Web GUI you should configure it in /etc/supervisord.conf both in [inet_http_server] (and|or [unix_http_server] if you prefer unix domain socket) and [supervisorctl]: From d5685bfaeb37d5b86a2e7b32755b486eb7846f84 Mon Sep 17 00:00:00 2001 From: Wilson de Carvalho <796900+wcmjunior@users.noreply.github.com> Date: Wed, 4 Sep 2024 22:12:49 -0700 Subject: [PATCH 05/10] Update module references --- .github/workflows/ci.yml | 4 +- Dockerfile | 10 +-- Dockerfile.github | 6 +- circle.yml | 4 +- config/go.mod | 4 +- config/process_group.go | 2 +- ctl.go | 6 +- events/go.mod | 4 +- faults/go.mod | 4 +- go.mod | 38 +++++------ go.sum | 123 ---------------------------------- logger/go.mod | 4 +- logger/log.go | 4 +- logtail.go | 3 +- main.go | 4 +- process/go.mod | 16 ++--- process/process.go | 21 +++--- process/process_manager.go | 2 +- rest-rpc.go | 2 +- signals/go.mod | 4 +- supervisor.go | 16 ++--- types/go.mod | 4 +- util/go.mod | 4 +- xmlrpc.go | 2 +- xmlrpcclient/go.mod | 4 +- xmlrpcclient/xmlrpc-client.go | 2 +- 26 files changed, 87 insertions(+), 210 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8faa30fa..8df74bf1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,9 +3,9 @@ name: CI on: push: - branches: [ "master" ] + branches: [ "main" ] pull_request: - branches: [ "master" ] + branches: [ "main" ] jobs: diff --git a/Dockerfile b/Dockerfile index 3f664183..b892cbfe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,10 +5,10 @@ RUN apk add --no-cache --update git gcc rust COPY . /src WORKDIR /src -RUN CGO_ENABLED=0 go build -a -ldflags "-linkmode external -extldflags -static" -o /usr/local/bin/supervisord github.com/ochinchina/supervisord +RUN CGO_ENABLED=1 go build -a -ldflags "-linkmode external -extldflags -static" -o /usr/local/bin/supervisord github.com/cyralinc/supervisord -FROM scratch +#FROM scratch +# +#COPY --from=builder /usr/local/bin/supervisord /usr/local/bin/supervisord -COPY --from=builder /usr/local/bin/supervisord /usr/local/bin/supervisord - -ENTRYPOINT ["/usr/local/bin/supervisord"] +#ENTRYPOINT ["/usr/local/bin/supervisord"] diff --git a/Dockerfile.github b/Dockerfile.github index 0bc30c6e..e3623d0d 100644 --- a/Dockerfile.github +++ b/Dockerfile.github @@ -2,7 +2,7 @@ # # Build with: # -# docker build . -f Dockerfile.github -t ochinchina/supervisord:latest +# docker build . -f Dockerfile.github -t cyralinc/supervisord:latest # FROM golang:alpine as builder @@ -14,9 +14,9 @@ RUN mkdir -p $GOPATH/src/golang.org/x && \ git clone https://github.com/golang/sys # Exit 0 to ignore meta tag complaints -RUN go get -v -u github.com/ochinchina/supervisord; exit 0 +RUN go get -v -u github.com/cyralinc/supervisord; exit 0 -RUN CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-extldflags -static" -o /usr/local/bin/supervisord github.com/ochinchina/supervisord +RUN CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-extldflags -static" -o /usr/local/bin/supervisord github.com/cyralinc/supervisord FROM scratch diff --git a/circle.yml b/circle.yml index 41481db3..9f3d0a7f 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ deployment: - master: - branch: [master] + main: + branch: [main] commands: - go version - go get github.com/mitchellh/gox diff --git a/config/go.mod b/config/go.mod index 6440bd82..1f4a4dd8 100644 --- a/config/go.mod +++ b/config/go.mod @@ -1,6 +1,6 @@ -module github.com/ochinchina/supervisord/config +module github.com/cyralinc/supervisord/config -go 1.16 +go 1.22 require ( github.com/ochinchina/go-ini v1.0.1 diff --git a/config/process_group.go b/config/process_group.go index d342cab3..ebd5c156 100644 --- a/config/process_group.go +++ b/config/process_group.go @@ -4,7 +4,7 @@ import ( "bytes" "strings" - "github.com/ochinchina/supervisord/util" + "github.com/cyralinc/supervisord/util" ) // ProcessGroup manage the program and its group mapping diff --git a/ctl.go b/ctl.go index 0bb9a653..97daffc6 100644 --- a/ctl.go +++ b/ctl.go @@ -6,10 +6,10 @@ import ( "os" "strings" + "github.com/cyralinc/supervisord/config" + "github.com/cyralinc/supervisord/types" + "github.com/cyralinc/supervisord/xmlrpcclient" "github.com/jessevdk/go-flags" - "github.com/ochinchina/supervisord/config" - "github.com/ochinchina/supervisord/types" - "github.com/ochinchina/supervisord/xmlrpcclient" ) // CtlCommand the entry of ctl command diff --git a/events/go.mod b/events/go.mod index 6fb751c6..6def657d 100644 --- a/events/go.mod +++ b/events/go.mod @@ -1,5 +1,5 @@ -module github.com/ochinchina/supervisord/events +module github.com/cyralinc/supervisord/events -go 1.16 +go 1.22 require github.com/sirupsen/logrus v1.8.1 diff --git a/faults/go.mod b/faults/go.mod index 534008fc..d64fc811 100644 --- a/faults/go.mod +++ b/faults/go.mod @@ -1,6 +1,6 @@ -module github.com/ochinchina/supervisord/faults +module github.com/cyralinc/supervisord/faults -go 1.16 +go 1.22 require ( github.com/gorilla/rpc v1.2.0 // indirect diff --git a/go.mod b/go.mod index beabfb74..635d4616 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,17 @@ -module github.com/ochinchina/supervisord +module github.com/cyralinc/supervisord go 1.22 require ( + github.com/cyralinc/supervisord/config v0.0.0-20230902082938-c2cae38b7454 + github.com/cyralinc/supervisord/events v0.0.0-20230902082938-c2cae38b7454 + github.com/cyralinc/supervisord/faults v0.0.0-20230902082938-c2cae38b7454 + github.com/cyralinc/supervisord/logger v0.0.0-20230902082938-c2cae38b7454 + github.com/cyralinc/supervisord/process v0.0.0-20230902082938-c2cae38b7454 + github.com/cyralinc/supervisord/signals v0.0.0-20230902082938-c2cae38b7454 + github.com/cyralinc/supervisord/types v0.0.0-20230902082938-c2cae38b7454 + github.com/cyralinc/supervisord/util v0.0.0-20230902082938-c2cae38b7454 + github.com/cyralinc/supervisord/xmlrpcclient v0.0.0-20230902082938-c2cae38b7454 github.com/gorilla/mux v1.8.1 github.com/gorilla/rpc v1.2.1 github.com/jessevdk/go-flags v1.6.1 @@ -11,15 +20,6 @@ require ( github.com/ochinchina/go-ini v1.0.1 github.com/ochinchina/go-reaper v0.0.0-20181016012355-6b11389e79fc github.com/ochinchina/gorilla-xmlrpc v0.0.0-20171012055324-ecf2fe693a2c - github.com/ochinchina/supervisord/config v0.0.0-20220721095143-c2527852d28f - github.com/ochinchina/supervisord/events v0.0.0-20220721095143-c2527852d28f - github.com/ochinchina/supervisord/faults v0.0.0-20220721095143-c2527852d28f - github.com/ochinchina/supervisord/logger v0.0.0-20220721095143-c2527852d28f - github.com/ochinchina/supervisord/process v0.0.0-20220520055329-8fdf6b62a44f - github.com/ochinchina/supervisord/signals v0.0.0-20220721095143-c2527852d28f - github.com/ochinchina/supervisord/types v0.0.0-20220520055329-8fdf6b62a44f - github.com/ochinchina/supervisord/util v0.0.0-20220721095143-c2527852d28f - github.com/ochinchina/supervisord/xmlrpcclient v0.0.0-20220520055329-8fdf6b62a44f github.com/prometheus/client_golang v1.20.2 github.com/sirupsen/logrus v1.9.3 ) @@ -42,13 +42,13 @@ require ( ) replace ( - github.com/ochinchina/supervisord/config => ./config - github.com/ochinchina/supervisord/events => ./events - github.com/ochinchina/supervisord/faults => ./faults - github.com/ochinchina/supervisord/logger => ./logger - github.com/ochinchina/supervisord/process => ./process - github.com/ochinchina/supervisord/signals => ./signals - github.com/ochinchina/supervisord/types => ./types - github.com/ochinchina/supervisord/util => ./util - github.com/ochinchina/supervisord/xmlrpcclient => ./xmlrpcclient + github.com/cyralinc/supervisord/config => ./config + github.com/cyralinc/supervisord/events => ./events + github.com/cyralinc/supervisord/faults => ./faults + github.com/cyralinc/supervisord/logger => ./logger + github.com/cyralinc/supervisord/process => ./process + github.com/cyralinc/supervisord/signals => ./signals + github.com/cyralinc/supervisord/types => ./types + github.com/cyralinc/supervisord/util => ./util + github.com/cyralinc/supervisord/xmlrpcclient => ./xmlrpcclient ) diff --git a/go.sum b/go.sum index cb40bb88..bdc6caf4 100644 --- a/go.sum +++ b/go.sum @@ -1,83 +1,30 @@ -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= 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/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= -github.com/gorilla/rpc v1.2.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ= github.com/gorilla/rpc v1.2.1 h1:yC+LMV5esttgpVvNORL/xX4jvTTEUE30UZhZ5JF7K9k= github.com/gorilla/rpc v1.2.1/go.mod h1:uNpOihAlF5xRFLuTYhfR0yfCTm0WTQSQttkMSptRfGk= github.com/hashicorp/go-envparse v0.1.0 h1:bE++6bhIsNCPLvgDZkYqo3nA+/PFI51pkrHdmPSDFPY= github.com/hashicorp/go-envparse v0.1.0/go.mod h1:OHheN1GoygLlAkTlXLXvAdnXdZxy8JUweQ1rAXx1xnc= github.com/jessevdk/go-flags v1.6.1 h1:Cvu5U8UGrLay1rZfv/zP7iLpSHGUZ/Ou68T0iX1bBK4= github.com/jessevdk/go-flags v1.6.1/go.mod h1:Mk8T1hIAWpOiJiHa9rJASDK2UGWji0EuPGBnNLMooyc= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA= github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= github.com/kardianos/service v1.2.2 h1:ZvePhAHfvo0A7Mftk/tEzqEZ7Q4lgnR8sGz4xu1YX60= github.com/kardianos/service v1.2.2/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM= github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/ochinchina/filechangemonitor v0.3.1 h1:Fyt8iE44kFwmI3ncNWAi21GZnmRBrAUSlMunpcDlMjQ= github.com/ochinchina/filechangemonitor v0.3.1/go.mod h1:OLRTJMpgb3yP1zBKA2g5GMYsKzJUoLq01lNOsReEzbQ= github.com/ochinchina/go-daemon v0.1.5 h1:XZoQ1NUXfeIGkU5rgbAwiNb1sr5btc2NbUqYUXmR5Zs= @@ -88,103 +35,33 @@ github.com/ochinchina/go-reaper v0.0.0-20181016012355-6b11389e79fc h1:oyaVoTfmN7 github.com/ochinchina/go-reaper v0.0.0-20181016012355-6b11389e79fc/go.mod h1:SmX+KYO+b7mEApGBUNwjdJpRQwAdb0Rlzoh8G77K55I= github.com/ochinchina/gorilla-xmlrpc v0.0.0-20171012055324-ecf2fe693a2c h1:6xgMUqscagnZicBedm1h4T3q6IQHbrrZp7bker+toOI= github.com/ochinchina/gorilla-xmlrpc v0.0.0-20171012055324-ecf2fe693a2c/go.mod h1:/gFmJ8Das0jFgYxzt/RkvAO62T/ZPcyTaZlOkEBu/jw= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 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/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.58.0 h1:N+N8vY4/23r6iYfD3UQZUoJPnUYAo7v6LG5XZxjZTXo= github.com/prometheus/common v0.58.0/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/go-charset v0.0.0-20190617161244-0dc95cdf6f31 h1:DE4LcMKyqAVa6a0CGmVxANbnVb7stzMmPkQiieyNmfQ= github.com/rogpeppe/go-charset v0.0.0-20190617161244-0dc95cdf6f31/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/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/logger/go.mod b/logger/go.mod index ad622b2e..bfccb0b6 100644 --- a/logger/go.mod +++ b/logger/go.mod @@ -1,3 +1,3 @@ -module github.com/ochinchina/supervisord/logger +module github.com/cyralinc/supervisord/logger -go 1.16 +go 1.22 diff --git a/logger/log.go b/logger/log.go index 26d86cd2..956a8921 100644 --- a/logger/log.go +++ b/logger/log.go @@ -8,8 +8,8 @@ import ( "strings" "sync" - "github.com/ochinchina/supervisord/events" - "github.com/ochinchina/supervisord/faults" + "github.com/cyralinc/supervisord/events" + "github.com/cyralinc/supervisord/faults" ) // Logger the log interface to log program stdout/stderr logs to file diff --git a/logtail.go b/logtail.go index eb5e4478..08c638b8 100644 --- a/logtail.go +++ b/logtail.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "github.com/ochinchina/supervisord/logger" "net/http" + "github.com/cyralinc/supervisord/logger" + "github.com/gorilla/mux" ) diff --git a/main.go b/main.go index 8df88761..50687852 100644 --- a/main.go +++ b/main.go @@ -11,10 +11,10 @@ import ( "syscall" "unicode" + "github.com/cyralinc/supervisord/config" + "github.com/cyralinc/supervisord/logger" "github.com/jessevdk/go-flags" "github.com/ochinchina/go-ini" - "github.com/ochinchina/supervisord/config" - "github.com/ochinchina/supervisord/logger" log "github.com/sirupsen/logrus" ) diff --git a/process/go.mod b/process/go.mod index 0b402b9f..95e8185f 100644 --- a/process/go.mod +++ b/process/go.mod @@ -1,15 +1,15 @@ -module github.com/ochinchina/supervisord/process +module github.com/cyralinc/supervisord/process -go 1.16 +go 1.22 require ( github.com/ochinchina/filechangemonitor v0.3.1 - github.com/ochinchina/supervisord/config v0.0.0-20220721095143-c2527852d28f - github.com/ochinchina/supervisord/events v0.0.0-20220721095143-c2527852d28f - github.com/ochinchina/supervisord/faults v0.0.0-20220721095143-c2527852d28f // indirect - github.com/ochinchina/supervisord/logger v0.0.0-20220721095143-c2527852d28f - github.com/ochinchina/supervisord/signals v0.0.0-20220721095143-c2527852d28f - github.com/ochinchina/supervisord/util v0.0.0-20220721095143-c2527852d28f // indirect + github.com/cyralinc/supervisord/config v0.0.0-20220721095143-c2527852d28f + github.com/cyralinc/supervisord/events v0.0.0-20220721095143-c2527852d28f + github.com/cyralinc/supervisord/faults v0.0.0-20220721095143-c2527852d28f // indirect + github.com/cyralinc/supervisord/logger v0.0.0-20220721095143-c2527852d28f + github.com/cyralinc/supervisord/signals v0.0.0-20220721095143-c2527852d28f + github.com/cyralinc/supervisord/util v0.0.0-20220721095143-c2527852d28f // indirect github.com/prometheus/client_golang v1.11.1 github.com/robfig/cron/v3 v3.0.1 github.com/sirupsen/logrus v1.8.1 diff --git a/process/process.go b/process/process.go index 62ded352..e4d1ccf5 100644 --- a/process/process.go +++ b/process/process.go @@ -15,11 +15,11 @@ import ( "syscall" "time" + "github.com/cyralinc/supervisord/config" + "github.com/cyralinc/supervisord/events" + "github.com/cyralinc/supervisord/logger" + "github.com/cyralinc/supervisord/signals" "github.com/ochinchina/filechangemonitor" - "github.com/ochinchina/supervisord/config" - "github.com/ochinchina/supervisord/events" - "github.com/ochinchina/supervisord/logger" - "github.com/ochinchina/supervisord/signals" "github.com/robfig/cron/v3" log "github.com/sirupsen/logrus" ) @@ -140,7 +140,8 @@ func (p *Process) addToCron() { // Start process // Args: -// wait - true, wait the program started or failed +// +// wait - true, wait the program started or failed func (p *Process) Start(wait bool) { log.WithFields(log.Fields{"program": p.GetName()}).Info("try to start program") p.lock.Lock() @@ -392,7 +393,6 @@ func (p *Process) getExitCodes() []int { } // check if the process is running or not -// func (p *Process) isRunning() bool { if p.cmd != nil && p.cmd.Process != nil { if runtime.GOOS == "windows" { @@ -506,7 +506,6 @@ func (p *Process) failToStartProgram(reason string, finishCb func()) { } // monitor if the program is in running before endTime -// func (p *Process) monitorProgramIsRunning(endTime time.Time, monitorExited *int32, programExited *int32) { // if time is not expired for time.Now().Before(endTime) && atomic.LoadInt32(programExited) == 0 { @@ -700,9 +699,9 @@ func (p *Process) changeStateTo(procState State) { // Signal sends signal to the process // // Args: -// sig - the signal to the process -// sigChildren - if true, sends the same signal to the process and its children // +// sig - the signal to the process +// sigChildren - if true, sends the same signal to the process and its children func (p *Process) Signal(sig os.Signal, sigChildren bool) error { p.lock.RLock() defer p.lock.RUnlock() @@ -727,9 +726,9 @@ func (p *Process) sendSignals(sigs []string, sigChildren bool) { // send signal to the process // // Args: -// sig - the signal to be sent -// sigChildren - if true, the signal also will be sent to children processes too // +// sig - the signal to be sent +// sigChildren - if true, the signal also will be sent to children processes too func (p *Process) sendSignal(sig os.Signal, sigChildren bool) error { if p.cmd != nil && p.cmd.Process != nil { log.WithFields(log.Fields{"program": p.GetName(), "signal": sig}).Info("Send signal to program") diff --git a/process/process_manager.go b/process/process_manager.go index e1d77b92..e3b59447 100644 --- a/process/process_manager.go +++ b/process/process_manager.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - "github.com/ochinchina/supervisord/config" + "github.com/cyralinc/supervisord/config" log "github.com/sirupsen/logrus" ) diff --git a/rest-rpc.go b/rest-rpc.go index add4d2ec..7ee8caf1 100644 --- a/rest-rpc.go +++ b/rest-rpc.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "net/http" + "github.com/cyralinc/supervisord/types" "github.com/gorilla/mux" - "github.com/ochinchina/supervisord/types" ) // SupervisorRestful the restful interface to control the programs defined in configuration file diff --git a/signals/go.mod b/signals/go.mod index 00d20172..6c374f93 100644 --- a/signals/go.mod +++ b/signals/go.mod @@ -1,5 +1,5 @@ -module github.com/ochinchina/supervisord/signals +module github.com/cyralinc/supervisord/signals -go 1.16 +go 1.22 require github.com/sirupsen/logrus v1.8.1 diff --git a/supervisor.go b/supervisor.go index 7cb6e0ce..696830c0 100644 --- a/supervisor.go +++ b/supervisor.go @@ -8,14 +8,14 @@ import ( "sync" "time" - "github.com/ochinchina/supervisord/config" - "github.com/ochinchina/supervisord/events" - "github.com/ochinchina/supervisord/faults" - "github.com/ochinchina/supervisord/logger" - "github.com/ochinchina/supervisord/process" - "github.com/ochinchina/supervisord/signals" - "github.com/ochinchina/supervisord/types" - "github.com/ochinchina/supervisord/util" + "github.com/cyralinc/supervisord/config" + "github.com/cyralinc/supervisord/events" + "github.com/cyralinc/supervisord/faults" + "github.com/cyralinc/supervisord/logger" + "github.com/cyralinc/supervisord/process" + "github.com/cyralinc/supervisord/signals" + "github.com/cyralinc/supervisord/types" + "github.com/cyralinc/supervisord/util" log "github.com/sirupsen/logrus" ) diff --git a/types/go.mod b/types/go.mod index bf41ea2d..cc982edd 100644 --- a/types/go.mod +++ b/types/go.mod @@ -1,3 +1,3 @@ -module github.com/ochinchina/supervisord/types +module github.com/cyralinc/supervisord/types -go 1.16 +go 1.22 diff --git a/util/go.mod b/util/go.mod index 2ab43242..6c1bd90c 100644 --- a/util/go.mod +++ b/util/go.mod @@ -1,3 +1,3 @@ -module github.com/ochinchina/supervisord/util +module github.com/cyralinc/supervisord/util -go 1.16 +go 1.22 diff --git a/xmlrpc.go b/xmlrpc.go index e3b2da08..ec0df5f8 100644 --- a/xmlrpc.go +++ b/xmlrpc.go @@ -12,9 +12,9 @@ import ( "path/filepath" "strings" + "github.com/cyralinc/supervisord/process" "github.com/gorilla/rpc" "github.com/ochinchina/gorilla-xmlrpc/xml" - "github.com/ochinchina/supervisord/process" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" log "github.com/sirupsen/logrus" diff --git a/xmlrpcclient/go.mod b/xmlrpcclient/go.mod index 88310742..447d1b19 100644 --- a/xmlrpcclient/go.mod +++ b/xmlrpcclient/go.mod @@ -1,6 +1,6 @@ -module github.com/ochinchina/supervisord/xmlrpcclient +module github.com/cyralinc/supervisord/xmlrpcclient -go 1.16 +go 1.22 require ( github.com/gorilla/rpc v1.2.0 // indirect diff --git a/xmlrpcclient/xmlrpc-client.go b/xmlrpcclient/xmlrpc-client.go index 7702da81..462ecca4 100644 --- a/xmlrpcclient/xmlrpc-client.go +++ b/xmlrpcclient/xmlrpc-client.go @@ -12,7 +12,7 @@ import ( "net/url" "time" - "github.com/ochinchina/supervisord/types" + "github.com/cyralinc/supervisord/types" "github.com/ochinchina/gorilla-xmlrpc/xml" ) From 9caa7cecac7d254bd2bfe16ce3a9e6fa13e0d356 Mon Sep 17 00:00:00 2001 From: Wilson de Carvalho <796900+wcmjunior@users.noreply.github.com> Date: Wed, 4 Sep 2024 22:17:19 -0700 Subject: [PATCH 06/10] Fix build and docker --- .github/workflows/ci.yml | 2 +- Dockerfile | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8df74bf1..60c0845e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: 1.22 diff --git a/Dockerfile b/Dockerfile index b892cbfe..d1700166 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:alpine AS builder +FROM golang:1.22-alpine3.20 AS builder RUN apk add --no-cache --update git gcc rust @@ -7,8 +7,8 @@ WORKDIR /src RUN CGO_ENABLED=1 go build -a -ldflags "-linkmode external -extldflags -static" -o /usr/local/bin/supervisord github.com/cyralinc/supervisord -#FROM scratch -# -#COPY --from=builder /usr/local/bin/supervisord /usr/local/bin/supervisord +FROM scratch -#ENTRYPOINT ["/usr/local/bin/supervisord"] +COPY --from=builder /usr/local/bin/supervisord /usr/local/bin/supervisord + +ENTRYPOINT ["/usr/local/bin/supervisord"] From 1ee15af7751717c04bdd84e53348edb5d3d8616a Mon Sep 17 00:00:00 2001 From: Wilson de Carvalho <796900+wcmjunior@users.noreply.github.com> Date: Wed, 4 Sep 2024 22:40:21 -0700 Subject: [PATCH 07/10] Run gofmt and remove old deprecated build directives --- assets_dev.go | 3 +-- assets_release.go | 1 - config/config.go | 9 +++++---- config/config_test.go | 2 +- config/process_sort_test.go | 2 -- daemonize.go | 1 - daemonize_windows.go | 2 +- events/events_test.go | 2 +- logger/log_unix.go | 3 +-- logger/log_windows.go | 1 - pidproxy/signal.go | 2 +- pidproxy/signal_windows.go | 1 - process/command_parser.go | 1 - process/pdeathsig_linux.go | 2 +- process/pdeathsig_other.go | 3 +-- process/pdeathsig_windows.go | 2 +- process/set_user_id.go | 4 ++-- process/set_user_id_windows.go | 2 +- rlimit.go | 2 +- rlimit_freebsd.go | 2 +- rlimit_windows.go | 2 +- signals/signal.go | 8 ++++---- signals/signal_darwin.go | 8 ++++---- signals/signal_windows.go | 14 +++++++------- types/process-name-sorter.go | 2 +- zombie_reaper.go | 2 +- zombie_reaper_windows.go | 2 +- 27 files changed, 38 insertions(+), 47 deletions(-) diff --git a/assets_dev.go b/assets_dev.go index 569a9472..68fbc6de 100644 --- a/assets_dev.go +++ b/assets_dev.go @@ -1,5 +1,4 @@ //go:build !release -// +build !release package main @@ -7,5 +6,5 @@ import ( "net/http" ) -//HTTP auto generated +// HTTP auto generated var HTTP http.FileSystem = http.Dir("./webgui") diff --git a/assets_release.go b/assets_release.go index 6e86e779..b745c031 100644 --- a/assets_release.go +++ b/assets_release.go @@ -1,5 +1,4 @@ //go:build release -// +build release package main diff --git a/config/config.go b/config/config.go index 9071ce93..bea82bab 100644 --- a/config/config.go +++ b/config/config.go @@ -117,7 +117,6 @@ func (c *Config) createEntry(name string, configDir string) *Entry { return entry } -// // Load the configuration and return loaded programs func (c *Config) Load() ([]string, error) { myini := ini.NewIni() @@ -405,7 +404,8 @@ func parseEnvFiles(s string) *map[string]string { } // GetEnv returns slice of strings with keys separated from values by single "=". An environment string example: -// environment = A="env 1",B="this is a test" +// +// environment = A="env 1",B="this is a test" func (c *Entry) GetEnv(key string) []string { value, ok := c.keyValues[key] result := make([]string, 0) @@ -426,7 +426,9 @@ func (c *Entry) GetEnv(key string) []string { } // GetEnvFromFiles returns slice of strings with keys separated from values by single "=". An envFile example: -// envFiles = global.env,prod.env +// +// envFiles = global.env,prod.env +// // cat global.env // varA=valueA func (c *Entry) GetEnvFromFiles(key string) []string { @@ -512,7 +514,6 @@ func (c *Entry) GetStringArray(key string, sep string) []string { // logSize=1GB // logSize=1KB // logSize=1024 -// func (c *Entry) GetBytes(key string, defValue int) int { v, ok := c.keyValues[key] diff --git a/config/config_test.go b/config/config_test.go index fd081071..99ef14e8 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -2,11 +2,11 @@ package config import ( "fmt" - "supervisord/util" "io/ioutil" "os" "path/filepath" "regexp" + "supervisord/util" "testing" ) diff --git a/config/process_sort_test.go b/config/process_sort_test.go index 45cb6821..006df9de 100644 --- a/config/process_sort_test.go +++ b/config/process_sort_test.go @@ -5,9 +5,7 @@ import ( "testing" ) -// // check if program1 is before the program2 in the Entry -// func isProgramBefore(entries []*Entry, program1 string, program2 string) bool { order := 0 program1Order := -1 diff --git a/daemonize.go b/daemonize.go index 19b52fd7..e1b2ffa5 100644 --- a/daemonize.go +++ b/daemonize.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package main diff --git a/daemonize_windows.go b/daemonize_windows.go index 4052b150..960b78db 100644 --- a/daemonize_windows.go +++ b/daemonize_windows.go @@ -1,4 +1,4 @@ -// +build windows +//go:build windows package main diff --git a/events/events_test.go b/events/events_test.go index 608aa05d..b355d89f 100644 --- a/events/events_test.go +++ b/events/events_test.go @@ -126,7 +126,7 @@ func TestProcessStartingEvent(t *testing.T) { if event.GetType() != "PROCESS_STATE_STARTING" { t.Error("Fail to creating the process starting event") } - fmt.Printf( "%s\n", event.GetBody() ) + fmt.Printf("%s\n", event.GetBody()) if event.GetBody() != "processname:proc-1 groupname:group-1 from_state:STOPPED tries:0" { t.Error("Fail to encode the process starting event") } diff --git a/logger/log_unix.go b/logger/log_unix.go index 88e95441..6be90077 100644 --- a/logger/log_unix.go +++ b/logger/log_unix.go @@ -1,4 +1,4 @@ -// +build !windows,!nacl,!plan9 +//go:build !windows && !nacl && !plan9 package logger @@ -165,7 +165,6 @@ func (bs *BackendSysLogWriter) Close() error { // // - protocol, could be tcp or udp, assuming udp as default // - port, if missing, by default for tcp is 6514 and for udp - 514 -// func parseSysLogConfig(config string) (protocol string, host string, port int, err error) { fields := strings.Split(config, ":") host = "" diff --git a/logger/log_windows.go b/logger/log_windows.go index a7f99ada..bb0510be 100644 --- a/logger/log_windows.go +++ b/logger/log_windows.go @@ -1,5 +1,4 @@ //go:build windows || plan9 || nacl -// +build windows plan9 nacl package logger diff --git a/pidproxy/signal.go b/pidproxy/signal.go index 1c0cc089..44f1caeb 100644 --- a/pidproxy/signal.go +++ b/pidproxy/signal.go @@ -1,4 +1,4 @@ -// +build !windows +//go:build !windows package main diff --git a/pidproxy/signal_windows.go b/pidproxy/signal_windows.go index 23ac5ee3..86b7e4c5 100644 --- a/pidproxy/signal_windows.go +++ b/pidproxy/signal_windows.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package main diff --git a/process/command_parser.go b/process/command_parser.go index ea3547ed..2e923e39 100644 --- a/process/command_parser.go +++ b/process/command_parser.go @@ -84,7 +84,6 @@ func parseCommand(command string) ([]string, error) { } // create command from string or []string -// func createCommand(command interface{}) (*exec.Cmd, error) { args := make([]string, 0) var err error = nil diff --git a/process/pdeathsig_linux.go b/process/pdeathsig_linux.go index 1530d1d2..0503d38f 100644 --- a/process/pdeathsig_linux.go +++ b/process/pdeathsig_linux.go @@ -1,4 +1,4 @@ -// +build linux +//go:build linux package process diff --git a/process/pdeathsig_other.go b/process/pdeathsig_other.go index f93945ad..6bfd488d 100644 --- a/process/pdeathsig_other.go +++ b/process/pdeathsig_other.go @@ -1,5 +1,4 @@ -// +build !linux -// +build !windows +//go:build !linux && !windows package process diff --git a/process/pdeathsig_windows.go b/process/pdeathsig_windows.go index 2e02c97e..f566cefa 100644 --- a/process/pdeathsig_windows.go +++ b/process/pdeathsig_windows.go @@ -1,4 +1,4 @@ -// +build windows +//go:build windows package process diff --git a/process/set_user_id.go b/process/set_user_id.go index c8dc564d..c0b55a87 100644 --- a/process/set_user_id.go +++ b/process/set_user_id.go @@ -1,13 +1,13 @@ //go:build !windows -// +build !windows package process import ( - log "github.com/sirupsen/logrus" "os/user" "strconv" "syscall" + + log "github.com/sirupsen/logrus" ) func setUserID(procAttr *syscall.SysProcAttr, uid uint32, gid uint32) { diff --git a/process/set_user_id_windows.go b/process/set_user_id_windows.go index 0db3f423..a5b2cd15 100644 --- a/process/set_user_id_windows.go +++ b/process/set_user_id_windows.go @@ -1,4 +1,4 @@ -// +build windows +//go:build windows package process diff --git a/rlimit.go b/rlimit.go index f1b4a347..4bc574bd 100644 --- a/rlimit.go +++ b/rlimit.go @@ -1,4 +1,4 @@ -// +build !windows,!freebsd +//go:build !windows && !freebsd package main diff --git a/rlimit_freebsd.go b/rlimit_freebsd.go index 7bed5ee3..80c0eede 100644 --- a/rlimit_freebsd.go +++ b/rlimit_freebsd.go @@ -1,4 +1,4 @@ -// +build freebsd +//go:build freebsd package main diff --git a/rlimit_windows.go b/rlimit_windows.go index a31d3803..244b1fe0 100644 --- a/rlimit_windows.go +++ b/rlimit_windows.go @@ -1,4 +1,4 @@ -// +build windows +//go:build windows package main diff --git a/signals/signal.go b/signals/signal.go index d300bdda..336610b4 100644 --- a/signals/signal.go +++ b/signals/signal.go @@ -1,4 +1,4 @@ -// +build !windows,!darwin +//go:build !windows && !darwin package signals @@ -59,10 +59,10 @@ func ToSignal(signalName string) (os.Signal, error) { // Kill sends signal to the process // // Args: -// process - the process which the signal should be sent to -// sig - the signal will be sent -// sigChildren - true if the signal needs to be sent to the children also // +// process - the process which the signal should be sent to +// sig - the signal will be sent +// sigChildren - true if the signal needs to be sent to the children also func Kill(process *os.Process, sig os.Signal, sigChildren bool) error { localSig := sig.(syscall.Signal) pid := process.Pid diff --git a/signals/signal_darwin.go b/signals/signal_darwin.go index 7360137f..dc41f9b3 100644 --- a/signals/signal_darwin.go +++ b/signals/signal_darwin.go @@ -1,4 +1,4 @@ -// +build darwin +//go:build darwin package signals @@ -57,10 +57,10 @@ func ToSignal(signalName string) (os.Signal, error) { // Kill send signal to the process // // Args: -// process - the process which the signal should be sent to -// sig - the signal will be sent -// sigChildren - true if the signal needs to be sent to the children also // +// process - the process which the signal should be sent to +// sig - the signal will be sent +// sigChildren - true if the signal needs to be sent to the children also func Kill(process *os.Process, sig os.Signal, sigChildren bool) error { localSig := sig.(syscall.Signal) pid := process.Pid diff --git a/signals/signal_windows.go b/signals/signal_windows.go index b6281f81..5eb08ee4 100644 --- a/signals/signal_windows.go +++ b/signals/signal_windows.go @@ -1,17 +1,18 @@ -// +build windows +//go:build windows package signals import ( "errors" "fmt" - log "github.com/sirupsen/logrus" "os" "os/exec" "syscall" + + log "github.com/sirupsen/logrus" ) -//convert a signal name to signal +// convert a signal name to signal func ToSignal(signalName string) (os.Signal, error) { if signalName == "HUP" { return syscall.SIGHUP, nil @@ -34,12 +35,11 @@ func ToSignal(signalName string) (os.Signal, error) { } -// // Args: -// process - the process -// sig - the signal -// sigChildren - ignore in windows system // +// process - the process +// sig - the signal +// sigChildren - ignore in windows system func Kill(process *os.Process, sig os.Signal, sigChilren bool) error { //Signal command can't kill children processes, call taskkill command to kill them cmd := exec.Command("taskkill", "/F", "/T", "/PID", fmt.Sprintf("%d", process.Pid)) diff --git a/types/process-name-sorter.go b/types/process-name-sorter.go index 97e66696..a769b278 100644 --- a/types/process-name-sorter.go +++ b/types/process-name-sorter.go @@ -28,7 +28,7 @@ func (pns *ProcessNameSorter) Less(i, j int) bool { // Swap i-th program and j-th program func (pns *ProcessNameSorter) Swap(i, j int) { swapF := reflect.Swapper(pns.processes) - swapF(i,j) + swapF(i, j) } // SortProcessInfos sorts the process information by program name diff --git a/zombie_reaper.go b/zombie_reaper.go index 45e957d3..3e7e34cc 100644 --- a/zombie_reaper.go +++ b/zombie_reaper.go @@ -1,4 +1,4 @@ -// +build !windows +//go:build !windows package main diff --git a/zombie_reaper_windows.go b/zombie_reaper_windows.go index 87d821ea..b7a214a6 100644 --- a/zombie_reaper_windows.go +++ b/zombie_reaper_windows.go @@ -1,4 +1,4 @@ -// +build windows +//go:build windows package main From 139c063a3b5349d7d8528800ce94c7e3e7a076f6 Mon Sep 17 00:00:00 2001 From: Wilson de Carvalho <796900+wcmjunior@users.noreply.github.com> Date: Tue, 10 Sep 2024 15:42:38 -0700 Subject: [PATCH 08/10] Rename module in go.mod files exclusively --- Dockerfile.github | 2 +- config/go.mod | 6 ++++++ config/go.sum | 2 ++ config/process_group.go | 2 +- ctl.go | 6 +++--- events/go.mod | 2 ++ faults/go.mod | 3 ++- go.mod | 40 +++++++++++++++++------------------ go.sum | 4 ++++ logger/go.mod | 18 ++++++++++++++++ logger/go.sum | 16 ++++++++++++++ logger/log.go | 4 ++-- logtail.go | 2 +- main.go | 4 ++-- process/go.mod | 38 +++++++++++++++++++++++++++------ process/go.sum | 14 ++---------- process/process.go | 8 +++---- process/process_manager.go | 2 +- rest-rpc.go | 2 +- signals/go.mod | 2 ++ supervisor.go | 16 +++++++------- xmlrpc.go | 2 +- xmlrpcclient/go.mod | 2 +- xmlrpcclient/xmlrpc-client.go | 2 +- 24 files changed, 133 insertions(+), 66 deletions(-) create mode 100644 logger/go.sum diff --git a/Dockerfile.github b/Dockerfile.github index e3623d0d..d8a4c0ae 100644 --- a/Dockerfile.github +++ b/Dockerfile.github @@ -4,7 +4,7 @@ # # docker build . -f Dockerfile.github -t cyralinc/supervisord:latest # -FROM golang:alpine as builder +FROM golang:1.22-alpine3.20 AS builder RUN apk add --no-cache --update git diff --git a/config/go.mod b/config/go.mod index 1f4a4dd8..91e9c540 100644 --- a/config/go.mod +++ b/config/go.mod @@ -3,6 +3,12 @@ module github.com/cyralinc/supervisord/config go 1.22 require ( + github.com/hashicorp/go-envparse v0.1.0 github.com/ochinchina/go-ini v1.0.1 + github.com/ochinchina/supervisord/util v0.0.0-20230902082938-c2cae38b7454 github.com/sirupsen/logrus v1.8.1 ) + +require golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 // indirect + +replace github.com/ochinchina/supervisord/util => ../util diff --git a/config/go.sum b/config/go.sum index 5463f752..614f31f6 100644 --- a/config/go.sum +++ b/config/go.sum @@ -1,5 +1,7 @@ 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/hashicorp/go-envparse v0.1.0 h1:bE++6bhIsNCPLvgDZkYqo3nA+/PFI51pkrHdmPSDFPY= +github.com/hashicorp/go-envparse v0.1.0/go.mod h1:OHheN1GoygLlAkTlXLXvAdnXdZxy8JUweQ1rAXx1xnc= github.com/ochinchina/go-ini v1.0.1 h1:qrKGrgxJjY+4H8aV7B2HPohShzHGrymW+/X1Gx933zU= github.com/ochinchina/go-ini v1.0.1/go.mod h1:Tqs5+JmccLSNMX1KXbbyG/B3ro4J9uXVYC5U5VOeRE8= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/config/process_group.go b/config/process_group.go index ebd5c156..d342cab3 100644 --- a/config/process_group.go +++ b/config/process_group.go @@ -4,7 +4,7 @@ import ( "bytes" "strings" - "github.com/cyralinc/supervisord/util" + "github.com/ochinchina/supervisord/util" ) // ProcessGroup manage the program and its group mapping diff --git a/ctl.go b/ctl.go index 97daffc6..0bb9a653 100644 --- a/ctl.go +++ b/ctl.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/cyralinc/supervisord/config" - "github.com/cyralinc/supervisord/types" - "github.com/cyralinc/supervisord/xmlrpcclient" "github.com/jessevdk/go-flags" + "github.com/ochinchina/supervisord/config" + "github.com/ochinchina/supervisord/types" + "github.com/ochinchina/supervisord/xmlrpcclient" ) // CtlCommand the entry of ctl command diff --git a/events/go.mod b/events/go.mod index 6def657d..dc6d6232 100644 --- a/events/go.mod +++ b/events/go.mod @@ -3,3 +3,5 @@ module github.com/cyralinc/supervisord/events go 1.22 require github.com/sirupsen/logrus v1.8.1 + +require golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 // indirect diff --git a/faults/go.mod b/faults/go.mod index d64fc811..6175f401 100644 --- a/faults/go.mod +++ b/faults/go.mod @@ -2,8 +2,9 @@ module github.com/cyralinc/supervisord/faults go 1.22 +require github.com/ochinchina/gorilla-xmlrpc v0.0.0-20171012055324-ecf2fe693a2c + require ( github.com/gorilla/rpc v1.2.0 // indirect - github.com/ochinchina/gorilla-xmlrpc v0.0.0-20171012055324-ecf2fe693a2c github.com/rogpeppe/go-charset v0.0.0-20190617161244-0dc95cdf6f31 // indirect ) diff --git a/go.mod b/go.mod index 635d4616..475da8a1 100644 --- a/go.mod +++ b/go.mod @@ -3,15 +3,6 @@ module github.com/cyralinc/supervisord go 1.22 require ( - github.com/cyralinc/supervisord/config v0.0.0-20230902082938-c2cae38b7454 - github.com/cyralinc/supervisord/events v0.0.0-20230902082938-c2cae38b7454 - github.com/cyralinc/supervisord/faults v0.0.0-20230902082938-c2cae38b7454 - github.com/cyralinc/supervisord/logger v0.0.0-20230902082938-c2cae38b7454 - github.com/cyralinc/supervisord/process v0.0.0-20230902082938-c2cae38b7454 - github.com/cyralinc/supervisord/signals v0.0.0-20230902082938-c2cae38b7454 - github.com/cyralinc/supervisord/types v0.0.0-20230902082938-c2cae38b7454 - github.com/cyralinc/supervisord/util v0.0.0-20230902082938-c2cae38b7454 - github.com/cyralinc/supervisord/xmlrpcclient v0.0.0-20230902082938-c2cae38b7454 github.com/gorilla/mux v1.8.1 github.com/gorilla/rpc v1.2.1 github.com/jessevdk/go-flags v1.6.1 @@ -20,7 +11,16 @@ require ( github.com/ochinchina/go-ini v1.0.1 github.com/ochinchina/go-reaper v0.0.0-20181016012355-6b11389e79fc github.com/ochinchina/gorilla-xmlrpc v0.0.0-20171012055324-ecf2fe693a2c - github.com/prometheus/client_golang v1.20.2 + github.com/ochinchina/supervisord/config v0.0.0-20230902082938-c2cae38b7454 + github.com/ochinchina/supervisord/events v0.0.0-20230902082938-c2cae38b7454 + github.com/ochinchina/supervisord/faults v0.0.0-20230902082938-c2cae38b7454 + github.com/ochinchina/supervisord/logger v0.0.0-20230902082938-c2cae38b7454 + github.com/ochinchina/supervisord/process v0.0.0-20230902082938-c2cae38b7454 + github.com/ochinchina/supervisord/signals v0.0.0-20230902082938-c2cae38b7454 + github.com/ochinchina/supervisord/types v0.0.0-20230902082938-c2cae38b7454 + github.com/ochinchina/supervisord/util v0.0.0-20230902082938-c2cae38b7454 + github.com/ochinchina/supervisord/xmlrpcclient v0.0.0-20230902082938-c2cae38b7454 + github.com/prometheus/client_golang v1.20.3 github.com/sirupsen/logrus v1.9.3 ) @@ -33,7 +33,7 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/ochinchina/filechangemonitor v0.3.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.58.0 // indirect + github.com/prometheus/common v0.59.1 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/rogpeppe/go-charset v0.0.0-20190617161244-0dc95cdf6f31 // indirect @@ -42,13 +42,13 @@ require ( ) replace ( - github.com/cyralinc/supervisord/config => ./config - github.com/cyralinc/supervisord/events => ./events - github.com/cyralinc/supervisord/faults => ./faults - github.com/cyralinc/supervisord/logger => ./logger - github.com/cyralinc/supervisord/process => ./process - github.com/cyralinc/supervisord/signals => ./signals - github.com/cyralinc/supervisord/types => ./types - github.com/cyralinc/supervisord/util => ./util - github.com/cyralinc/supervisord/xmlrpcclient => ./xmlrpcclient + github.com/ochinchina/supervisord/config => ./config + github.com/ochinchina/supervisord/events => ./events + github.com/ochinchina/supervisord/faults => ./faults + github.com/ochinchina/supervisord/logger => ./logger + github.com/ochinchina/supervisord/process => ./process + github.com/ochinchina/supervisord/signals => ./signals + github.com/ochinchina/supervisord/types => ./types + github.com/ochinchina/supervisord/util => ./util + github.com/ochinchina/supervisord/xmlrpcclient => ./xmlrpcclient ) diff --git a/go.sum b/go.sum index bdc6caf4..5361cabb 100644 --- a/go.sum +++ b/go.sum @@ -39,10 +39,14 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.3 h1:oPksm4K8B+Vt35tUhw6GbSNSgVlVSBH0qELP/7u83l4= +github.com/prometheus/client_golang v1.20.3/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.58.0 h1:N+N8vY4/23r6iYfD3UQZUoJPnUYAo7v6LG5XZxjZTXo= github.com/prometheus/common v0.58.0/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0= +github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJoX0= +github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= diff --git a/logger/go.mod b/logger/go.mod index bfccb0b6..dae9beb6 100644 --- a/logger/go.mod +++ b/logger/go.mod @@ -1,3 +1,21 @@ module github.com/cyralinc/supervisord/logger go 1.22 + +require ( + github.com/ochinchina/supervisord/events v0.0.0-20230902082938-c2cae38b7454 + github.com/ochinchina/supervisord/faults v0.0.0-20230902082938-c2cae38b7454 +) + +require ( + github.com/gorilla/rpc v1.2.0 // indirect + github.com/ochinchina/gorilla-xmlrpc v0.0.0-20171012055324-ecf2fe693a2c // indirect + github.com/rogpeppe/go-charset v0.0.0-20190617161244-0dc95cdf6f31 // indirect + github.com/sirupsen/logrus v1.8.1 // indirect + golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 // indirect +) + +replace ( + github.com/ochinchina/supervisord/events => ../events + github.com/ochinchina/supervisord/faults => ../faults +) diff --git a/logger/go.sum b/logger/go.sum new file mode 100644 index 00000000..db79ae42 --- /dev/null +++ b/logger/go.sum @@ -0,0 +1,16 @@ +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/gorilla/rpc v1.2.0 h1:WvvdC2lNeT1SP32zrIce5l0ECBfbAlmrmSBsuc57wfk= +github.com/gorilla/rpc v1.2.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ= +github.com/ochinchina/gorilla-xmlrpc v0.0.0-20171012055324-ecf2fe693a2c h1:6xgMUqscagnZicBedm1h4T3q6IQHbrrZp7bker+toOI= +github.com/ochinchina/gorilla-xmlrpc v0.0.0-20171012055324-ecf2fe693a2c/go.mod h1:/gFmJ8Das0jFgYxzt/RkvAO62T/ZPcyTaZlOkEBu/jw= +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/rogpeppe/go-charset v0.0.0-20190617161244-0dc95cdf6f31 h1:DE4LcMKyqAVa6a0CGmVxANbnVb7stzMmPkQiieyNmfQ= +github.com/rogpeppe/go-charset v0.0.0-20190617161244-0dc95cdf6f31/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= +github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/logger/log.go b/logger/log.go index 956a8921..26d86cd2 100644 --- a/logger/log.go +++ b/logger/log.go @@ -8,8 +8,8 @@ import ( "strings" "sync" - "github.com/cyralinc/supervisord/events" - "github.com/cyralinc/supervisord/faults" + "github.com/ochinchina/supervisord/events" + "github.com/ochinchina/supervisord/faults" ) // Logger the log interface to log program stdout/stderr logs to file diff --git a/logtail.go b/logtail.go index 08c638b8..9a86661a 100644 --- a/logtail.go +++ b/logtail.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/cyralinc/supervisord/logger" + "github.com/ochinchina/supervisord/logger" "github.com/gorilla/mux" ) diff --git a/main.go b/main.go index 50687852..8df88761 100644 --- a/main.go +++ b/main.go @@ -11,10 +11,10 @@ import ( "syscall" "unicode" - "github.com/cyralinc/supervisord/config" - "github.com/cyralinc/supervisord/logger" "github.com/jessevdk/go-flags" "github.com/ochinchina/go-ini" + "github.com/ochinchina/supervisord/config" + "github.com/ochinchina/supervisord/logger" log "github.com/sirupsen/logrus" ) diff --git a/process/go.mod b/process/go.mod index 95e8185f..b56b6674 100644 --- a/process/go.mod +++ b/process/go.mod @@ -4,13 +4,39 @@ go 1.22 require ( github.com/ochinchina/filechangemonitor v0.3.1 - github.com/cyralinc/supervisord/config v0.0.0-20220721095143-c2527852d28f - github.com/cyralinc/supervisord/events v0.0.0-20220721095143-c2527852d28f - github.com/cyralinc/supervisord/faults v0.0.0-20220721095143-c2527852d28f // indirect - github.com/cyralinc/supervisord/logger v0.0.0-20220721095143-c2527852d28f - github.com/cyralinc/supervisord/signals v0.0.0-20220721095143-c2527852d28f - github.com/cyralinc/supervisord/util v0.0.0-20220721095143-c2527852d28f // indirect + github.com/ochinchina/supervisord/config v0.0.0-20220721095143-c2527852d28f + github.com/ochinchina/supervisord/events v0.0.0-20220721095143-c2527852d28f + github.com/ochinchina/supervisord/logger v0.0.0-20220721095143-c2527852d28f + github.com/ochinchina/supervisord/signals v0.0.0-20220721095143-c2527852d28f github.com/prometheus/client_golang v1.11.1 github.com/robfig/cron/v3 v3.0.1 github.com/sirupsen/logrus v1.8.1 ) + +require ( + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/golang/protobuf v1.4.3 // indirect + github.com/gorilla/rpc v1.2.0 // indirect + github.com/hashicorp/go-envparse v0.1.0 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/ochinchina/go-ini v1.0.1 // indirect + github.com/ochinchina/gorilla-xmlrpc v0.0.0-20171012055324-ecf2fe693a2c // indirect + github.com/ochinchina/supervisord/faults v0.0.0-20220721095143-c2527852d28f // indirect + github.com/ochinchina/supervisord/util v0.0.0-20220721095143-c2527852d28f // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.26.0 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + github.com/rogpeppe/go-charset v0.0.0-20190617161244-0dc95cdf6f31 // indirect + golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect + google.golang.org/protobuf v1.26.0-rc.1 // indirect +) + +replace ( + github.com/ochinchina/supervisord/config => ../config + github.com/ochinchina/supervisord/events => ../events + github.com/ochinchina/supervisord/faults => ../faults + github.com/ochinchina/supervisord/logger => ../logger + github.com/ochinchina/supervisord/signals => ../signals + github.com/ochinchina/supervisord/util => ../util +) diff --git a/process/go.sum b/process/go.sum index fd88136f..8a262e4d 100644 --- a/process/go.sum +++ b/process/go.sum @@ -41,6 +41,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/gorilla/rpc v1.2.0 h1:WvvdC2lNeT1SP32zrIce5l0ECBfbAlmrmSBsuc57wfk= github.com/gorilla/rpc v1.2.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ= +github.com/hashicorp/go-envparse v0.1.0 h1:bE++6bhIsNCPLvgDZkYqo3nA+/PFI51pkrHdmPSDFPY= +github.com/hashicorp/go-envparse v0.1.0/go.mod h1:OHheN1GoygLlAkTlXLXvAdnXdZxy8JUweQ1rAXx1xnc= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -67,18 +69,6 @@ github.com/ochinchina/go-ini v1.0.1 h1:qrKGrgxJjY+4H8aV7B2HPohShzHGrymW+/X1Gx933 github.com/ochinchina/go-ini v1.0.1/go.mod h1:Tqs5+JmccLSNMX1KXbbyG/B3ro4J9uXVYC5U5VOeRE8= github.com/ochinchina/gorilla-xmlrpc v0.0.0-20171012055324-ecf2fe693a2c h1:6xgMUqscagnZicBedm1h4T3q6IQHbrrZp7bker+toOI= github.com/ochinchina/gorilla-xmlrpc v0.0.0-20171012055324-ecf2fe693a2c/go.mod h1:/gFmJ8Das0jFgYxzt/RkvAO62T/ZPcyTaZlOkEBu/jw= -github.com/ochinchina/supervisord/config v0.0.0-20220721095143-c2527852d28f h1:gIHtOgmQQPYdXAXlNWzuS5F2QIGVO2I5FCy002QcQTs= -github.com/ochinchina/supervisord/config v0.0.0-20220721095143-c2527852d28f/go.mod h1:jMN/SL0T6GCWWG/dD7Les9iPqjQ2OjEVyBWx8c9RJqI= -github.com/ochinchina/supervisord/events v0.0.0-20220721095143-c2527852d28f h1:4lMzp4SZ74EPwBHHB4yXj4F8ZiYlMZBIoUcXY9aaRvI= -github.com/ochinchina/supervisord/events v0.0.0-20220721095143-c2527852d28f/go.mod h1:I+vx/d8jVSVe0nmhaJUPuouUnhpfUUiUbDciSDViL5I= -github.com/ochinchina/supervisord/faults v0.0.0-20220721095143-c2527852d28f h1:LVTLViuwGGKrIELAwjbrF9hqTlLH1GuMdGUpUWTH62s= -github.com/ochinchina/supervisord/faults v0.0.0-20220721095143-c2527852d28f/go.mod h1:kReR3fnUfV2OHFESJ9IDriCTg/VU1D0cFfNPNOnMQCs= -github.com/ochinchina/supervisord/logger v0.0.0-20220721095143-c2527852d28f h1:y4rKKo9PCNXONiz8O9StGV0M9zvdiKICoT46Sseh+7k= -github.com/ochinchina/supervisord/logger v0.0.0-20220721095143-c2527852d28f/go.mod h1:DPIKvK0KqJdneJKrAqfLNgONWZ3m4cRAi96PG0A7deg= -github.com/ochinchina/supervisord/signals v0.0.0-20220721095143-c2527852d28f h1:VMEbkgaQtcXv4TXpJx2j0ROHKrNX5vkmFTMVNNd/7Ek= -github.com/ochinchina/supervisord/signals v0.0.0-20220721095143-c2527852d28f/go.mod h1:o2x4RZxVWzKvgbSOv7G8z94pITwuweY+ZkITvp/VqGY= -github.com/ochinchina/supervisord/util v0.0.0-20220721095143-c2527852d28f h1:onQeBQXBdsGR9+tbuGveT+Zlfy6K7CBhCZCB2gg0j30= -github.com/ochinchina/supervisord/util v0.0.0-20220721095143-c2527852d28f/go.mod h1:V/yb0hfd2ax3Pzn83yoxBxww4HLJ5AXYH+rQBCieqcU= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/process/process.go b/process/process.go index e4d1ccf5..0311abbf 100644 --- a/process/process.go +++ b/process/process.go @@ -15,11 +15,11 @@ import ( "syscall" "time" - "github.com/cyralinc/supervisord/config" - "github.com/cyralinc/supervisord/events" - "github.com/cyralinc/supervisord/logger" - "github.com/cyralinc/supervisord/signals" "github.com/ochinchina/filechangemonitor" + "github.com/ochinchina/supervisord/config" + "github.com/ochinchina/supervisord/events" + "github.com/ochinchina/supervisord/logger" + "github.com/ochinchina/supervisord/signals" "github.com/robfig/cron/v3" log "github.com/sirupsen/logrus" ) diff --git a/process/process_manager.go b/process/process_manager.go index e3b59447..e1d77b92 100644 --- a/process/process_manager.go +++ b/process/process_manager.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - "github.com/cyralinc/supervisord/config" + "github.com/ochinchina/supervisord/config" log "github.com/sirupsen/logrus" ) diff --git a/rest-rpc.go b/rest-rpc.go index 7ee8caf1..add4d2ec 100644 --- a/rest-rpc.go +++ b/rest-rpc.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "net/http" - "github.com/cyralinc/supervisord/types" "github.com/gorilla/mux" + "github.com/ochinchina/supervisord/types" ) // SupervisorRestful the restful interface to control the programs defined in configuration file diff --git a/signals/go.mod b/signals/go.mod index 6c374f93..d4f52ca3 100644 --- a/signals/go.mod +++ b/signals/go.mod @@ -3,3 +3,5 @@ module github.com/cyralinc/supervisord/signals go 1.22 require github.com/sirupsen/logrus v1.8.1 + +require golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 // indirect diff --git a/supervisor.go b/supervisor.go index 696830c0..7cb6e0ce 100644 --- a/supervisor.go +++ b/supervisor.go @@ -8,14 +8,14 @@ import ( "sync" "time" - "github.com/cyralinc/supervisord/config" - "github.com/cyralinc/supervisord/events" - "github.com/cyralinc/supervisord/faults" - "github.com/cyralinc/supervisord/logger" - "github.com/cyralinc/supervisord/process" - "github.com/cyralinc/supervisord/signals" - "github.com/cyralinc/supervisord/types" - "github.com/cyralinc/supervisord/util" + "github.com/ochinchina/supervisord/config" + "github.com/ochinchina/supervisord/events" + "github.com/ochinchina/supervisord/faults" + "github.com/ochinchina/supervisord/logger" + "github.com/ochinchina/supervisord/process" + "github.com/ochinchina/supervisord/signals" + "github.com/ochinchina/supervisord/types" + "github.com/ochinchina/supervisord/util" log "github.com/sirupsen/logrus" ) diff --git a/xmlrpc.go b/xmlrpc.go index ec0df5f8..e3b2da08 100644 --- a/xmlrpc.go +++ b/xmlrpc.go @@ -12,9 +12,9 @@ import ( "path/filepath" "strings" - "github.com/cyralinc/supervisord/process" "github.com/gorilla/rpc" "github.com/ochinchina/gorilla-xmlrpc/xml" + "github.com/ochinchina/supervisord/process" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" log "github.com/sirupsen/logrus" diff --git a/xmlrpcclient/go.mod b/xmlrpcclient/go.mod index 447d1b19..394f3941 100644 --- a/xmlrpcclient/go.mod +++ b/xmlrpcclient/go.mod @@ -1,4 +1,4 @@ -module github.com/cyralinc/supervisord/xmlrpcclient +module github.com/ochinchina/supervisord/xmlrpcclient go 1.22 diff --git a/xmlrpcclient/xmlrpc-client.go b/xmlrpcclient/xmlrpc-client.go index 462ecca4..7702da81 100644 --- a/xmlrpcclient/xmlrpc-client.go +++ b/xmlrpcclient/xmlrpc-client.go @@ -12,7 +12,7 @@ import ( "net/url" "time" - "github.com/cyralinc/supervisord/types" + "github.com/ochinchina/supervisord/types" "github.com/ochinchina/gorilla-xmlrpc/xml" ) From fd25413a0269d8ee08ccd8d9fa92aea0aa5e11ee Mon Sep 17 00:00:00 2001 From: Wilson de Carvalho <796900+wcmjunior@users.noreply.github.com> Date: Tue, 10 Sep 2024 15:43:26 -0700 Subject: [PATCH 09/10] Revert "Run gofmt and remove old deprecated build directives" This reverts commit 1ee15af7751717c04bdd84e53348edb5d3d8616a. --- assets_dev.go | 3 ++- assets_release.go | 1 + config/config.go | 9 ++++----- config/config_test.go | 2 +- config/process_sort_test.go | 2 ++ daemonize.go | 1 + daemonize_windows.go | 2 +- events/events_test.go | 2 +- logger/log_unix.go | 3 ++- logger/log_windows.go | 1 + pidproxy/signal.go | 2 +- pidproxy/signal_windows.go | 1 + process/command_parser.go | 1 + process/pdeathsig_linux.go | 2 +- process/pdeathsig_other.go | 3 ++- process/pdeathsig_windows.go | 2 +- process/set_user_id.go | 4 ++-- process/set_user_id_windows.go | 2 +- rlimit.go | 2 +- rlimit_freebsd.go | 2 +- rlimit_windows.go | 2 +- signals/signal.go | 8 ++++---- signals/signal_darwin.go | 8 ++++---- signals/signal_windows.go | 14 +++++++------- types/process-name-sorter.go | 2 +- zombie_reaper.go | 2 +- zombie_reaper_windows.go | 2 +- 27 files changed, 47 insertions(+), 38 deletions(-) diff --git a/assets_dev.go b/assets_dev.go index 68fbc6de..569a9472 100644 --- a/assets_dev.go +++ b/assets_dev.go @@ -1,4 +1,5 @@ //go:build !release +// +build !release package main @@ -6,5 +7,5 @@ import ( "net/http" ) -// HTTP auto generated +//HTTP auto generated var HTTP http.FileSystem = http.Dir("./webgui") diff --git a/assets_release.go b/assets_release.go index b745c031..6e86e779 100644 --- a/assets_release.go +++ b/assets_release.go @@ -1,4 +1,5 @@ //go:build release +// +build release package main diff --git a/config/config.go b/config/config.go index bea82bab..9071ce93 100644 --- a/config/config.go +++ b/config/config.go @@ -117,6 +117,7 @@ func (c *Config) createEntry(name string, configDir string) *Entry { return entry } +// // Load the configuration and return loaded programs func (c *Config) Load() ([]string, error) { myini := ini.NewIni() @@ -404,8 +405,7 @@ func parseEnvFiles(s string) *map[string]string { } // GetEnv returns slice of strings with keys separated from values by single "=". An environment string example: -// -// environment = A="env 1",B="this is a test" +// environment = A="env 1",B="this is a test" func (c *Entry) GetEnv(key string) []string { value, ok := c.keyValues[key] result := make([]string, 0) @@ -426,9 +426,7 @@ func (c *Entry) GetEnv(key string) []string { } // GetEnvFromFiles returns slice of strings with keys separated from values by single "=". An envFile example: -// -// envFiles = global.env,prod.env -// +// envFiles = global.env,prod.env // cat global.env // varA=valueA func (c *Entry) GetEnvFromFiles(key string) []string { @@ -514,6 +512,7 @@ func (c *Entry) GetStringArray(key string, sep string) []string { // logSize=1GB // logSize=1KB // logSize=1024 +// func (c *Entry) GetBytes(key string, defValue int) int { v, ok := c.keyValues[key] diff --git a/config/config_test.go b/config/config_test.go index 99ef14e8..fd081071 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -2,11 +2,11 @@ package config import ( "fmt" + "supervisord/util" "io/ioutil" "os" "path/filepath" "regexp" - "supervisord/util" "testing" ) diff --git a/config/process_sort_test.go b/config/process_sort_test.go index 006df9de..45cb6821 100644 --- a/config/process_sort_test.go +++ b/config/process_sort_test.go @@ -5,7 +5,9 @@ import ( "testing" ) +// // check if program1 is before the program2 in the Entry +// func isProgramBefore(entries []*Entry, program1 string, program2 string) bool { order := 0 program1Order := -1 diff --git a/daemonize.go b/daemonize.go index e1b2ffa5..19b52fd7 100644 --- a/daemonize.go +++ b/daemonize.go @@ -1,4 +1,5 @@ //go:build !windows +// +build !windows package main diff --git a/daemonize_windows.go b/daemonize_windows.go index 960b78db..4052b150 100644 --- a/daemonize_windows.go +++ b/daemonize_windows.go @@ -1,4 +1,4 @@ -//go:build windows +// +build windows package main diff --git a/events/events_test.go b/events/events_test.go index b355d89f..608aa05d 100644 --- a/events/events_test.go +++ b/events/events_test.go @@ -126,7 +126,7 @@ func TestProcessStartingEvent(t *testing.T) { if event.GetType() != "PROCESS_STATE_STARTING" { t.Error("Fail to creating the process starting event") } - fmt.Printf("%s\n", event.GetBody()) + fmt.Printf( "%s\n", event.GetBody() ) if event.GetBody() != "processname:proc-1 groupname:group-1 from_state:STOPPED tries:0" { t.Error("Fail to encode the process starting event") } diff --git a/logger/log_unix.go b/logger/log_unix.go index 6be90077..88e95441 100644 --- a/logger/log_unix.go +++ b/logger/log_unix.go @@ -1,4 +1,4 @@ -//go:build !windows && !nacl && !plan9 +// +build !windows,!nacl,!plan9 package logger @@ -165,6 +165,7 @@ func (bs *BackendSysLogWriter) Close() error { // // - protocol, could be tcp or udp, assuming udp as default // - port, if missing, by default for tcp is 6514 and for udp - 514 +// func parseSysLogConfig(config string) (protocol string, host string, port int, err error) { fields := strings.Split(config, ":") host = "" diff --git a/logger/log_windows.go b/logger/log_windows.go index bb0510be..a7f99ada 100644 --- a/logger/log_windows.go +++ b/logger/log_windows.go @@ -1,4 +1,5 @@ //go:build windows || plan9 || nacl +// +build windows plan9 nacl package logger diff --git a/pidproxy/signal.go b/pidproxy/signal.go index 44f1caeb..1c0cc089 100644 --- a/pidproxy/signal.go +++ b/pidproxy/signal.go @@ -1,4 +1,4 @@ -//go:build !windows +// +build !windows package main diff --git a/pidproxy/signal_windows.go b/pidproxy/signal_windows.go index 86b7e4c5..23ac5ee3 100644 --- a/pidproxy/signal_windows.go +++ b/pidproxy/signal_windows.go @@ -1,4 +1,5 @@ //go:build windows +// +build windows package main diff --git a/process/command_parser.go b/process/command_parser.go index 2e923e39..ea3547ed 100644 --- a/process/command_parser.go +++ b/process/command_parser.go @@ -84,6 +84,7 @@ func parseCommand(command string) ([]string, error) { } // create command from string or []string +// func createCommand(command interface{}) (*exec.Cmd, error) { args := make([]string, 0) var err error = nil diff --git a/process/pdeathsig_linux.go b/process/pdeathsig_linux.go index 0503d38f..1530d1d2 100644 --- a/process/pdeathsig_linux.go +++ b/process/pdeathsig_linux.go @@ -1,4 +1,4 @@ -//go:build linux +// +build linux package process diff --git a/process/pdeathsig_other.go b/process/pdeathsig_other.go index 6bfd488d..f93945ad 100644 --- a/process/pdeathsig_other.go +++ b/process/pdeathsig_other.go @@ -1,4 +1,5 @@ -//go:build !linux && !windows +// +build !linux +// +build !windows package process diff --git a/process/pdeathsig_windows.go b/process/pdeathsig_windows.go index f566cefa..2e02c97e 100644 --- a/process/pdeathsig_windows.go +++ b/process/pdeathsig_windows.go @@ -1,4 +1,4 @@ -//go:build windows +// +build windows package process diff --git a/process/set_user_id.go b/process/set_user_id.go index c0b55a87..c8dc564d 100644 --- a/process/set_user_id.go +++ b/process/set_user_id.go @@ -1,13 +1,13 @@ //go:build !windows +// +build !windows package process import ( + log "github.com/sirupsen/logrus" "os/user" "strconv" "syscall" - - log "github.com/sirupsen/logrus" ) func setUserID(procAttr *syscall.SysProcAttr, uid uint32, gid uint32) { diff --git a/process/set_user_id_windows.go b/process/set_user_id_windows.go index a5b2cd15..0db3f423 100644 --- a/process/set_user_id_windows.go +++ b/process/set_user_id_windows.go @@ -1,4 +1,4 @@ -//go:build windows +// +build windows package process diff --git a/rlimit.go b/rlimit.go index 4bc574bd..f1b4a347 100644 --- a/rlimit.go +++ b/rlimit.go @@ -1,4 +1,4 @@ -//go:build !windows && !freebsd +// +build !windows,!freebsd package main diff --git a/rlimit_freebsd.go b/rlimit_freebsd.go index 80c0eede..7bed5ee3 100644 --- a/rlimit_freebsd.go +++ b/rlimit_freebsd.go @@ -1,4 +1,4 @@ -//go:build freebsd +// +build freebsd package main diff --git a/rlimit_windows.go b/rlimit_windows.go index 244b1fe0..a31d3803 100644 --- a/rlimit_windows.go +++ b/rlimit_windows.go @@ -1,4 +1,4 @@ -//go:build windows +// +build windows package main diff --git a/signals/signal.go b/signals/signal.go index 336610b4..d300bdda 100644 --- a/signals/signal.go +++ b/signals/signal.go @@ -1,4 +1,4 @@ -//go:build !windows && !darwin +// +build !windows,!darwin package signals @@ -59,10 +59,10 @@ func ToSignal(signalName string) (os.Signal, error) { // Kill sends signal to the process // // Args: +// process - the process which the signal should be sent to +// sig - the signal will be sent +// sigChildren - true if the signal needs to be sent to the children also // -// process - the process which the signal should be sent to -// sig - the signal will be sent -// sigChildren - true if the signal needs to be sent to the children also func Kill(process *os.Process, sig os.Signal, sigChildren bool) error { localSig := sig.(syscall.Signal) pid := process.Pid diff --git a/signals/signal_darwin.go b/signals/signal_darwin.go index dc41f9b3..7360137f 100644 --- a/signals/signal_darwin.go +++ b/signals/signal_darwin.go @@ -1,4 +1,4 @@ -//go:build darwin +// +build darwin package signals @@ -57,10 +57,10 @@ func ToSignal(signalName string) (os.Signal, error) { // Kill send signal to the process // // Args: +// process - the process which the signal should be sent to +// sig - the signal will be sent +// sigChildren - true if the signal needs to be sent to the children also // -// process - the process which the signal should be sent to -// sig - the signal will be sent -// sigChildren - true if the signal needs to be sent to the children also func Kill(process *os.Process, sig os.Signal, sigChildren bool) error { localSig := sig.(syscall.Signal) pid := process.Pid diff --git a/signals/signal_windows.go b/signals/signal_windows.go index 5eb08ee4..b6281f81 100644 --- a/signals/signal_windows.go +++ b/signals/signal_windows.go @@ -1,18 +1,17 @@ -//go:build windows +// +build windows package signals import ( "errors" "fmt" + log "github.com/sirupsen/logrus" "os" "os/exec" "syscall" - - log "github.com/sirupsen/logrus" ) -// convert a signal name to signal +//convert a signal name to signal func ToSignal(signalName string) (os.Signal, error) { if signalName == "HUP" { return syscall.SIGHUP, nil @@ -35,11 +34,12 @@ func ToSignal(signalName string) (os.Signal, error) { } +// // Args: +// process - the process +// sig - the signal +// sigChildren - ignore in windows system // -// process - the process -// sig - the signal -// sigChildren - ignore in windows system func Kill(process *os.Process, sig os.Signal, sigChilren bool) error { //Signal command can't kill children processes, call taskkill command to kill them cmd := exec.Command("taskkill", "/F", "/T", "/PID", fmt.Sprintf("%d", process.Pid)) diff --git a/types/process-name-sorter.go b/types/process-name-sorter.go index a769b278..97e66696 100644 --- a/types/process-name-sorter.go +++ b/types/process-name-sorter.go @@ -28,7 +28,7 @@ func (pns *ProcessNameSorter) Less(i, j int) bool { // Swap i-th program and j-th program func (pns *ProcessNameSorter) Swap(i, j int) { swapF := reflect.Swapper(pns.processes) - swapF(i, j) + swapF(i,j) } // SortProcessInfos sorts the process information by program name diff --git a/zombie_reaper.go b/zombie_reaper.go index 3e7e34cc..45e957d3 100644 --- a/zombie_reaper.go +++ b/zombie_reaper.go @@ -1,4 +1,4 @@ -//go:build !windows +// +build !windows package main diff --git a/zombie_reaper_windows.go b/zombie_reaper_windows.go index b7a214a6..87d821ea 100644 --- a/zombie_reaper_windows.go +++ b/zombie_reaper_windows.go @@ -1,4 +1,4 @@ -//go:build windows +// +build windows package main From eee8ff890b2c60d320dd3216e33ed06aeff2e4a6 Mon Sep 17 00:00:00 2001 From: Wilson de Carvalho <796900+wcmjunior@users.noreply.github.com> Date: Wed, 11 Sep 2024 14:25:39 -0700 Subject: [PATCH 10/10] Rollback to CGO_ENABLED=0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d1700166..1647f592 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ RUN apk add --no-cache --update git gcc rust COPY . /src WORKDIR /src -RUN CGO_ENABLED=1 go build -a -ldflags "-linkmode external -extldflags -static" -o /usr/local/bin/supervisord github.com/cyralinc/supervisord +RUN CGO_ENABLED=0 go build -a -ldflags "-linkmode external -extldflags -static" -o /usr/local/bin/supervisord github.com/cyralinc/supervisord FROM scratch