diff --git a/cmd/root.go b/cmd/root.go index b9f8e58..62f7830 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -1,9 +1,9 @@ package cmd import ( - "github.com/JieTrancender/nsq_to_consumer/consumer" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/cmd" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/cmd/instance" + "github.com/JieTrancender/nsq_consumer/consumer" + "github.com/JieTrancender/nsq_consumer/libconsumer/cmd" + "github.com/JieTrancender/nsq_consumer/libconsumer/cmd/instance" "github.com/spf13/pflag" ) diff --git a/consumer/consumer.go b/consumer/consumer.go index 3e9086b..1a8399a 100644 --- a/consumer/consumer.go +++ b/consumer/consumer.go @@ -5,11 +5,11 @@ import ( "sync" "time" - "github.com/JieTrancender/nsq_to_consumer/internal/version" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/cmd/instance" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/common" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/consumer" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/logp" + "github.com/JieTrancender/nsq_consumer/internal/version" + "github.com/JieTrancender/nsq_consumer/libconsumer/cmd/instance" + "github.com/JieTrancender/nsq_consumer/libconsumer/common" + "github.com/JieTrancender/nsq_consumer/libconsumer/consumer" + "github.com/JieTrancender/nsq_consumer/libconsumer/logp" "github.com/nsqio/go-nsq" ) diff --git a/go.mod b/go.mod index 1fbca59..56366b4 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/JieTrancender/nsq_to_consumer +module github.com/JieTrancender/nsq_consumer go 1.14 @@ -12,7 +12,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.1.3 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.5.0 // indirect + github.com/stretchr/testify v1.5.0 go.etcd.io/etcd v3.3.25+incompatible go.uber.org/zap v1.14.0 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect diff --git a/libconsumer/cmd/instance/consumer.go b/libconsumer/cmd/instance/consumer.go index 35d4738..8b38324 100644 --- a/libconsumer/cmd/instance/consumer.go +++ b/libconsumer/cmd/instance/consumer.go @@ -10,14 +10,14 @@ import ( "go.etcd.io/etcd/clientv3" - "github.com/JieTrancender/nsq_to_consumer/internal/version" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/common" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/consumer" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/logp" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/logp/configure" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/outputs" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/publisher/pipeline" - svc "github.com/JieTrancender/nsq_to_consumer/libconsumer/service" + "github.com/JieTrancender/nsq_consumer/internal/version" + "github.com/JieTrancender/nsq_consumer/libconsumer/common" + "github.com/JieTrancender/nsq_consumer/libconsumer/consumer" + "github.com/JieTrancender/nsq_consumer/libconsumer/logp" + "github.com/JieTrancender/nsq_consumer/libconsumer/logp/configure" + "github.com/JieTrancender/nsq_consumer/libconsumer/outputs" + "github.com/JieTrancender/nsq_consumer/libconsumer/publisher/pipeline" + svc "github.com/JieTrancender/nsq_consumer/libconsumer/service" ) // Consumer provides the runnable and configurable instance of a consumer. diff --git a/libconsumer/cmd/instance/imports_common.go b/libconsumer/cmd/instance/imports_common.go index a128fcf..0edfc54 100644 --- a/libconsumer/cmd/instance/imports_common.go +++ b/libconsumer/cmd/instance/imports_common.go @@ -1,5 +1,5 @@ package instance import ( - _ "github.com/JieTrancender/nsq_to_consumer/libconsumer/publisher/includes" + _ "github.com/JieTrancender/nsq_consumer/libconsumer/publisher/includes" ) diff --git a/libconsumer/cmd/root.go b/libconsumer/cmd/root.go index 8a807ce..14b21cf 100644 --- a/libconsumer/cmd/root.go +++ b/libconsumer/cmd/root.go @@ -1,8 +1,8 @@ package cmd import ( - "github.com/JieTrancender/nsq_to_consumer/libconsumer/cmd/instance" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/consumer" + "github.com/JieTrancender/nsq_consumer/libconsumer/cmd/instance" + "github.com/JieTrancender/nsq_consumer/libconsumer/consumer" "github.com/spf13/cobra" ) diff --git a/libconsumer/cmd/run.go b/libconsumer/cmd/run.go index 92a1c6c..63292cc 100644 --- a/libconsumer/cmd/run.go +++ b/libconsumer/cmd/run.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/JieTrancender/nsq_to_consumer/internal/version" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/cmd/instance" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/consumer" + "github.com/JieTrancender/nsq_consumer/internal/version" + "github.com/JieTrancender/nsq_consumer/libconsumer/cmd/instance" + "github.com/JieTrancender/nsq_consumer/libconsumer/consumer" "github.com/spf13/cobra" ) diff --git a/libconsumer/cmd/version.go b/libconsumer/cmd/version.go index b95b2b8..06eef22 100644 --- a/libconsumer/cmd/version.go +++ b/libconsumer/cmd/version.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/cmd/instance" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/common/cli" + "github.com/JieTrancender/nsq_consumer/libconsumer/cmd/instance" + "github.com/JieTrancender/nsq_consumer/libconsumer/common/cli" ) func genVersionCmd(settings instance.Settings) *cobra.Command { diff --git a/libconsumer/consumer/consumer.go b/libconsumer/consumer/consumer.go index 28487c6..0c4a6b9 100644 --- a/libconsumer/consumer/consumer.go +++ b/libconsumer/consumer/consumer.go @@ -1,7 +1,7 @@ package consumer import ( - "github.com/JieTrancender/nsq_to_consumer/libconsumer/common" + "github.com/JieTrancender/nsq_consumer/libconsumer/common" ) type Creator func(*ConsumerEntity, *common.Config) (Consumer, error) diff --git a/libconsumer/logp/configure/logging.go b/libconsumer/logp/configure/logging.go index 381ae8e..d37fcac 100644 --- a/libconsumer/logp/configure/logging.go +++ b/libconsumer/logp/configure/logging.go @@ -4,8 +4,8 @@ import ( "flag" "fmt" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/common" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/logp" + "github.com/JieTrancender/nsq_consumer/libconsumer/common" + "github.com/JieTrancender/nsq_consumer/libconsumer/logp" ) var ( diff --git a/libconsumer/outputs/console/console.go b/libconsumer/outputs/console/console.go index 074b4ff..8badc43 100644 --- a/libconsumer/outputs/console/console.go +++ b/libconsumer/outputs/console/console.go @@ -7,10 +7,10 @@ import ( "os" "runtime" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/common" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/consumer" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/logp" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/outputs" + "github.com/JieTrancender/nsq_consumer/libconsumer/common" + "github.com/JieTrancender/nsq_consumer/libconsumer/consumer" + "github.com/JieTrancender/nsq_consumer/libconsumer/logp" + "github.com/JieTrancender/nsq_consumer/libconsumer/outputs" ) type console struct { diff --git a/libconsumer/outputs/nsq/client.go b/libconsumer/outputs/nsq/client.go index 38d7b9e..16381e7 100644 --- a/libconsumer/outputs/nsq/client.go +++ b/libconsumer/outputs/nsq/client.go @@ -4,9 +4,9 @@ import ( "context" "sync" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/consumer" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/logp" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/outputs" + "github.com/JieTrancender/nsq_consumer/libconsumer/consumer" + "github.com/JieTrancender/nsq_consumer/libconsumer/logp" + "github.com/JieTrancender/nsq_consumer/libconsumer/outputs" "github.com/nsqio/go-nsq" ) diff --git a/libconsumer/outputs/nsq/config.go b/libconsumer/outputs/nsq/config.go index ef4c1d8..8f25e9c 100644 --- a/libconsumer/outputs/nsq/config.go +++ b/libconsumer/outputs/nsq/config.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/common" + "github.com/JieTrancender/nsq_consumer/libconsumer/common" ) type Config struct { diff --git a/libconsumer/outputs/nsq/nsq.go b/libconsumer/outputs/nsq/nsq.go index 06cc4b2..5828636 100644 --- a/libconsumer/outputs/nsq/nsq.go +++ b/libconsumer/outputs/nsq/nsq.go @@ -1,9 +1,9 @@ package nsq import ( - "github.com/JieTrancender/nsq_to_consumer/libconsumer/common" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/consumer" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/outputs" + "github.com/JieTrancender/nsq_consumer/libconsumer/common" + "github.com/JieTrancender/nsq_consumer/libconsumer/consumer" + "github.com/JieTrancender/nsq_consumer/libconsumer/outputs" ) const ( diff --git a/libconsumer/outputs/output_reg.go b/libconsumer/outputs/output_reg.go index c4f26c6..3069b4f 100644 --- a/libconsumer/outputs/output_reg.go +++ b/libconsumer/outputs/output_reg.go @@ -3,9 +3,9 @@ package outputs import ( "fmt" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/common" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/consumer" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/logp" + "github.com/JieTrancender/nsq_consumer/libconsumer/common" + "github.com/JieTrancender/nsq_consumer/libconsumer/consumer" + "github.com/JieTrancender/nsq_consumer/libconsumer/logp" ) var outputReg = map[string]Factory{} diff --git a/libconsumer/outputs/outputs.go b/libconsumer/outputs/outputs.go index 965f89c..b0cc68b 100644 --- a/libconsumer/outputs/outputs.go +++ b/libconsumer/outputs/outputs.go @@ -3,7 +3,7 @@ package outputs import ( "context" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/consumer" + "github.com/JieTrancender/nsq_consumer/libconsumer/consumer" ) type Client interface { diff --git a/libconsumer/publisher/includes/includes.go b/libconsumer/publisher/includes/includes.go index 214b596..7865b10 100644 --- a/libconsumer/publisher/includes/includes.go +++ b/libconsumer/publisher/includes/includes.go @@ -1,6 +1,6 @@ package includes import ( - _ "github.com/JieTrancender/nsq_to_consumer/libconsumer/outputs/console" - _ "github.com/JieTrancender/nsq_to_consumer/libconsumer/outputs/nsq" + _ "github.com/JieTrancender/nsq_consumer/libconsumer/outputs/console" + _ "github.com/JieTrancender/nsq_consumer/libconsumer/outputs/nsq" ) diff --git a/libconsumer/publisher/pipeline/client.go b/libconsumer/publisher/pipeline/client.go index ce51b18..06b3c75 100644 --- a/libconsumer/publisher/pipeline/client.go +++ b/libconsumer/publisher/pipeline/client.go @@ -3,7 +3,7 @@ package pipeline import ( "fmt" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/consumer" + "github.com/JieTrancender/nsq_consumer/libconsumer/consumer" ) type client struct { diff --git a/libconsumer/publisher/pipeline/consumer.go b/libconsumer/publisher/pipeline/consumer.go index bdb0eb7..8a74bd6 100644 --- a/libconsumer/publisher/pipeline/consumer.go +++ b/libconsumer/publisher/pipeline/consumer.go @@ -4,8 +4,8 @@ import ( "errors" "sync" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/common/atomic" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/logp" + "github.com/JieTrancender/nsq_consumer/libconsumer/common/atomic" + "github.com/JieTrancender/nsq_consumer/libconsumer/logp" ) type eventConsumer struct { diff --git a/libconsumer/publisher/pipeline/controller.go b/libconsumer/publisher/pipeline/controller.go index 315dff7..fb87ecd 100644 --- a/libconsumer/publisher/pipeline/controller.go +++ b/libconsumer/publisher/pipeline/controller.go @@ -1,9 +1,9 @@ package pipeline import ( - "github.com/JieTrancender/nsq_to_consumer/libconsumer/consumer" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/logp" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/outputs" + "github.com/JieTrancender/nsq_consumer/libconsumer/consumer" + "github.com/JieTrancender/nsq_consumer/libconsumer/logp" + "github.com/JieTrancender/nsq_consumer/libconsumer/outputs" "github.com/nsqio/go-nsq" ) diff --git a/libconsumer/publisher/pipeline/module.go b/libconsumer/publisher/pipeline/module.go index a47eae5..3c6210c 100644 --- a/libconsumer/publisher/pipeline/module.go +++ b/libconsumer/publisher/pipeline/module.go @@ -1,9 +1,9 @@ package pipeline import ( - "github.com/JieTrancender/nsq_to_consumer/libconsumer/consumer" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/logp" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/outputs" + "github.com/JieTrancender/nsq_consumer/libconsumer/consumer" + "github.com/JieTrancender/nsq_consumer/libconsumer/logp" + "github.com/JieTrancender/nsq_consumer/libconsumer/outputs" ) type OutputFactory func() (string, outputs.Group, error) diff --git a/libconsumer/publisher/pipeline/output.go b/libconsumer/publisher/pipeline/output.go index 08a7fbf..ef51f8f 100644 --- a/libconsumer/publisher/pipeline/output.go +++ b/libconsumer/publisher/pipeline/output.go @@ -3,9 +3,9 @@ package pipeline import ( "context" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/consumer" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/logp" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/outputs" + "github.com/JieTrancender/nsq_consumer/libconsumer/consumer" + "github.com/JieTrancender/nsq_consumer/libconsumer/logp" + "github.com/JieTrancender/nsq_consumer/libconsumer/outputs" ) type worker struct { diff --git a/libconsumer/publisher/pipeline/pipeline.go b/libconsumer/publisher/pipeline/pipeline.go index 24f096d..e709794 100644 --- a/libconsumer/publisher/pipeline/pipeline.go +++ b/libconsumer/publisher/pipeline/pipeline.go @@ -1,9 +1,9 @@ package pipeline import ( - "github.com/JieTrancender/nsq_to_consumer/libconsumer/consumer" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/logp" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/outputs" + "github.com/JieTrancender/nsq_consumer/libconsumer/consumer" + "github.com/JieTrancender/nsq_consumer/libconsumer/logp" + "github.com/JieTrancender/nsq_consumer/libconsumer/outputs" ) type Pipeline struct { diff --git a/libconsumer/service/service.go b/libconsumer/service/service.go index dfaf340..7b31a10 100644 --- a/libconsumer/service/service.go +++ b/libconsumer/service/service.go @@ -7,7 +7,7 @@ import ( "sync" "syscall" - "github.com/JieTrancender/nsq_to_consumer/libconsumer/logp" + "github.com/JieTrancender/nsq_consumer/libconsumer/logp" ) // HandleSignals manages OS signals that ask the service/daemon to stop. diff --git a/main.go b/main.go index 135c5b4..7322e43 100644 --- a/main.go +++ b/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/JieTrancender/nsq_to_consumer/cmd" + "github.com/JieTrancender/nsq_consumer/cmd" ) func main() {