Merge pull request nsqio#75 from youzan/optimize-code

Optimize code

.travis.yml

@@ -11,7 +11,7 @@ sudo: false
 script:
   - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
   - dep ensure
-  - travis_wait ./test.sh
+  - travis_wait 25 ./test.sh
 notifications:
   email: false
 

Gopkg.toml

@@ -127,7 +127,7 @@
 
 [[constraint]]
   name = "github.com/youzan/go-nsq"
-  version = "1.3.1"
+  version = "1.3.2-HA"
 
 [[constraint]]
   branch = "master"

apps/nsqd/nsqd.go

@@ -164,6 +164,7 @@ func nsqdFlagSet(opts *nsqd.Options) *flag.FlagSet {
 	flagSet.Duration("queue-scan-refresh-interval", opts.QueueScanRefreshInterval, "scan refresh interval for new channels")
 	flagSet.Int("queue-scan-selection-count", opts.QueueScanSelectionCount, "select count for each scan")
 	flagSet.Int("queue-scan-worker-pool-max", opts.QueueScanWorkerPoolMax, "the max scan worker pool")
+	flagSet.Int("queue-topic-job-worker-pool-max", opts.QueueTopicJobWorkerPoolMax, "the max scan worker pool")
 	flagSet.Float64("queue-scan-dirty-percent", opts.QueueScanDirtyPercent, "retry scan immediately if dirty percent happened in last scan")
 	flagSet.Bool("allow-zan-test-skip", opts.AllowZanTestSkip, "allow zan test message filter in new created channel & channels under newly upgraded topic")
 	flagSet.Int("default-commit-buf", int(opts.DefaultCommitBuf), "the default commit buffer for topic data")