From 542fdd3c8d6dbe036e3447b3fa185e6bdf04a0df Mon Sep 17 00:00:00 2001 From: ochinchina Date: Mon, 3 May 2021 16:42:56 +0800 Subject: [PATCH] go get error... #255 --- config/config_test.go | 2 +- config/process_group.go | 2 +- config/process_group_test.go | 2 +- ctl.go | 6 +++--- go.mod | 19 ++----------------- go.sum | 14 +++++++++++--- logger/log.go | 4 ++-- logtail.go | 2 +- main.go | 4 ++-- process/process.go | 8 ++++---- process/process_manager.go | 2 +- process/process_manager_test.go | 2 +- rest-rpc.go | 2 +- supervisor.go | 16 ++++++++-------- xmlrpc.go | 2 +- xmlrpcclient/xmlrpc-client.go | 2 +- 16 files changed, 41 insertions(+), 48 deletions(-) diff --git a/config/config_test.go b/config/config_test.go index 026a3528..fd081071 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -2,7 +2,7 @@ package config import ( "fmt" - "github.com/ochinchina/supervisord/util" + "supervisord/util" "io/ioutil" "os" "path/filepath" diff --git a/config/process_group.go b/config/process_group.go index 9afc3722..5340d060 100644 --- a/config/process_group.go +++ b/config/process_group.go @@ -2,7 +2,7 @@ package config import ( "bytes" - "github.com/ochinchina/supervisord/util" + "supervisord/util" "strings" ) diff --git a/config/process_group_test.go b/config/process_group_test.go index e3b290d1..bb1ad1b5 100644 --- a/config/process_group_test.go +++ b/config/process_group_test.go @@ -1,7 +1,7 @@ package config import ( - "github.com/ochinchina/supervisord/util" + "supervisord/util" "testing" ) diff --git a/ctl.go b/ctl.go index 355bb0f6..05ae1ff6 100644 --- a/ctl.go +++ b/ctl.go @@ -3,9 +3,9 @@ package main import ( "fmt" "github.com/jessevdk/go-flags" - "github.com/ochinchina/supervisord/config" - "github.com/ochinchina/supervisord/types" - "github.com/ochinchina/supervisord/xmlrpcclient" + "supervisord/config" + "supervisord/types" + "supervisord/xmlrpcclient" "net/http" "os" "strings" diff --git a/go.mod b/go.mod index b3175d35..3223c418 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ochinchina/supervisord +module supervisord go 1.15 @@ -20,20 +20,5 @@ require ( github.com/rogpeppe/go-charset v0.0.0-20190617161244-0dc95cdf6f31 // indirect github.com/sirupsen/logrus v1.8.1 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420 - golang.org/x/sys v0.0.0-20210503073744-b6777538623b // 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/process => ./process - github.com/ochinchina/supervisord/signals => ./signals - github.com/ochinchina/supervisord/types => ./types - github.com/ochinchina/supervisord/util => ./util - github.com/ochinchina/supervisord/webgui => ./webgui - github.com/ochinchina/supervisord/xmlrpcclient => ./xmlrpcclient - - + golang.org/x/sys v0.0.0-20210503080704-8803ae5d1324 // indirect ) diff --git a/go.sum b/go.sum index 4a297624..49c25228 100644 --- a/go.sum +++ b/go.sum @@ -40,6 +40,7 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= 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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= @@ -93,6 +94,7 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw 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 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= @@ -154,8 +156,10 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o 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 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= 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 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= @@ -222,6 +226,7 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE 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/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -254,7 +259,6 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ= 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/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= @@ -284,6 +288,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ 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 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= @@ -371,8 +376,8 @@ golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210503073744-b6777538623b h1:JWC69xVWHab8bjJYC2FN1ueBMws7//XKzN4wy7XQoso= -golang.org/x/sys v0.0.0-20210503073744-b6777538623b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210503080704-8803ae5d1324 h1:pAwJxDByZctfPwzlNGrDN2BQLsdPb9NkhoTJtUkAO28= +golang.org/x/sys v0.0.0-20210503080704-8803ae5d1324/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= 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= @@ -394,6 +399,7 @@ golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= 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 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= @@ -426,6 +432,7 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ 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 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= @@ -439,6 +446,7 @@ 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 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/logger/log.go b/logger/log.go index b87e9706..d6c6da38 100644 --- a/logger/log.go +++ b/logger/log.go @@ -3,8 +3,8 @@ package logger import ( "errors" "fmt" - "github.com/ochinchina/supervisord/events" - "github.com/ochinchina/supervisord/faults" + "supervisord/events" + "supervisord/faults" "io" "os" "strings" diff --git a/logtail.go b/logtail.go index 4a891a67..ee1482ba 100644 --- a/logtail.go +++ b/logtail.go @@ -2,7 +2,7 @@ package main import ( "github.com/gorilla/mux" - logger "github.com/ochinchina/supervisord/logger" + logger "supervisord/logger" "net/http" ) diff --git a/main.go b/main.go index b8404459..a15f0476 100644 --- a/main.go +++ b/main.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/jessevdk/go-flags" ini "github.com/ochinchina/go-ini" - "github.com/ochinchina/supervisord/config" - "github.com/ochinchina/supervisord/logger" + "supervisord/config" + "supervisord/logger" log "github.com/sirupsen/logrus" "os" "os/signal" diff --git a/process/process.go b/process/process.go index cfc13148..e9ac5ca3 100644 --- a/process/process.go +++ b/process/process.go @@ -16,10 +16,10 @@ import ( "time" "github.com/ochinchina/filechangemonitor" - "github.com/ochinchina/supervisord/config" - "github.com/ochinchina/supervisord/events" - "github.com/ochinchina/supervisord/logger" - "github.com/ochinchina/supervisord/signals" + "supervisord/config" + "supervisord/events" + "supervisord/logger" + "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 1b0140a4..abf8cbad 100644 --- a/process/process_manager.go +++ b/process/process_manager.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - "github.com/ochinchina/supervisord/config" + "supervisord/config" log "github.com/sirupsen/logrus" ) diff --git a/process/process_manager_test.go b/process/process_manager_test.go index a598c7d4..97ecee6e 100644 --- a/process/process_manager_test.go +++ b/process/process_manager_test.go @@ -1,7 +1,7 @@ package process import ( - "github.com/ochinchina/supervisord/config" + "supervisord/config" "testing" ) diff --git a/rest-rpc.go b/rest-rpc.go index e99c207b..d744e03d 100644 --- a/rest-rpc.go +++ b/rest-rpc.go @@ -3,7 +3,7 @@ package main import ( "encoding/json" "github.com/gorilla/mux" - "github.com/ochinchina/supervisord/types" + "supervisord/types" "io/ioutil" "net/http" ) diff --git a/supervisor.go b/supervisor.go index 1de57b7b..9a662a1c 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" + "supervisord/config" + "supervisord/events" + "supervisord/faults" + "supervisord/logger" + "supervisord/process" + "supervisord/signals" + "supervisord/types" + "supervisord/util" log "github.com/sirupsen/logrus" ) diff --git a/xmlrpc.go b/xmlrpc.go index fe103769..c5af0d84 100644 --- a/xmlrpc.go +++ b/xmlrpc.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "github.com/gorilla/rpc" "github.com/ochinchina/gorilla-xmlrpc/xml" - "github.com/ochinchina/supervisord/process" + "supervisord/process" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" log "github.com/sirupsen/logrus" diff --git a/xmlrpcclient/xmlrpc-client.go b/xmlrpcclient/xmlrpc-client.go index b7e25e97..d38e98ca 100644 --- a/xmlrpcclient/xmlrpc-client.go +++ b/xmlrpcclient/xmlrpc-client.go @@ -12,7 +12,7 @@ import ( "net/url" "time" - "github.com/ochinchina/supervisord/types" + "supervisord/types" "github.com/ochinchina/gorilla-xmlrpc/xml" )