Merge pull request #1056 from ploxiln/rm_nsq_pubsub

remove nsq_pubsub
nsqio · Jul 19, 2018 · 9e2de3f · 9e2de3f
2 parents 6ab87aa + 68c495a
commit 9e2de3f
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 285 deletions.
diff --git a/Makefile b/Makefile
@@ -9,13 +9,12 @@ ifeq (${GOOS},windows)
     EXT=.exe
 endif
 
-APPS = nsqd nsqlookupd nsqadmin nsq_pubsub nsq_to_nsq nsq_to_file nsq_to_http nsq_tail nsq_stat to_nsq
+APPS = nsqd nsqlookupd nsqadmin nsq_to_nsq nsq_to_file nsq_to_http nsq_tail nsq_stat to_nsq
 all: $(APPS)
 
 $(BLDDIR)/nsqd:        $(wildcard apps/nsqd/*.go       nsqd/*.go       nsq/*.go internal/*/*.go)
 $(BLDDIR)/nsqlookupd:  $(wildcard apps/nsqlookupd/*.go nsqlookupd/*.go nsq/*.go internal/*/*.go)
 $(BLDDIR)/nsqadmin:    $(wildcard apps/nsqadmin/*.go   nsqadmin/*.go nsqadmin/templates/*.go internal/*/*.go)
-$(BLDDIR)/nsq_pubsub:  $(wildcard apps/nsq_pubsub/*.go  nsq/*.go internal/*/*.go)
 $(BLDDIR)/nsq_to_nsq:  $(wildcard apps/nsq_to_nsq/*.go  nsq/*.go internal/*/*.go)
 $(BLDDIR)/nsq_to_file: $(wildcard apps/nsq_to_file/*.go nsq/*.go internal/*/*.go)
 $(BLDDIR)/nsq_to_http: $(wildcard apps/nsq_to_http/*.go nsq/*.go internal/*/*.go)

diff --git a/apps/nsq_pubsub/README.md b/apps/nsq_pubsub/README.md
diff --git a/apps/nsq_pubsub/nsq_pubsub.go b/apps/nsq_pubsub/nsq_pubsub.go
diff --git a/contrib/nsq.spec b/contrib/nsq.spec
@@ -40,7 +40,6 @@ make PREFIX=/${path} DESTDIR=$RPM_BUILD_ROOT install
 /%{path}/bin/nsqadmin
 /%{path}/bin/nsqd
 /%{path}/bin/nsqlookupd
-/%{path}/bin/nsq_pubsub
 /%{path}/bin/nsq_to_file
 /%{path}/bin/nsq_to_http
 /%{path}/bin/nsq_to_nsq