From 22e36124da26906d41bad45e4501f0c3fd1716a7 Mon Sep 17 00:00:00 2001
From: Pierce Lopez <pierce.lopez@gmail.com>
Date: Thu, 5 Jan 2017 14:01:07 -0500
Subject: [PATCH] rename nsqd option --worker-id to --node-id

---
 apps/nsqd/nsqd.go |  3 ++-
 nsqd/guid.go      | 14 +++++++-------
 nsqd/nsqd.go      |  2 +-
 nsqd/options.go   |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/apps/nsqd/nsqd.go b/apps/nsqd/nsqd.go
index 60bc26b6f..54ba531ec 100644
--- a/apps/nsqd/nsqd.go
+++ b/apps/nsqd/nsqd.go
@@ -80,7 +80,8 @@ func nsqdFlagSet(opts *nsqd.Options) *flag.FlagSet {
 	flagSet.Bool("version", false, "print version string")
 	flagSet.Bool("verbose", false, "enable verbose logging")
 	flagSet.String("config", "", "path to config file")
-	flagSet.Int64("worker-id", opts.ID, "unique seed for message ID generation (int) in range [0,4096) (will default to a hash of hostname)")
+	flagSet.Int64("node-id", opts.ID, "unique part for message IDs, (int) in range [0,1024) (default is hash of hostname)")
+	flagSet.Bool("worker-id", false, "do NOT use this, use --node-id")
 
 	flagSet.String("https-address", opts.HTTPSAddress, "<addr>:<port> to listen on for HTTPS clients")
 	flagSet.String("http-address", opts.HTTPAddress, "<addr>:<port> to listen on for HTTP clients")
diff --git a/nsqd/guid.go b/nsqd/guid.go
index f86c78b8e..89ba83e9e 100644
--- a/nsqd/guid.go
+++ b/nsqd/guid.go
@@ -17,10 +17,10 @@ import (
 )
 
 const (
-	workerIDBits   = uint64(10)
+	nodeIDBits     = uint64(10)
 	sequenceBits   = uint64(12)
-	workerIDShift  = sequenceBits
-	timestampShift = sequenceBits + workerIDBits
+	nodeIDShift    = sequenceBits
+	timestampShift = sequenceBits + nodeIDBits
 	sequenceMask   = int64(-1) ^ (int64(-1) << sequenceBits)
 
 	// ( 2012-10-28 16:23:42 UTC ).UnixNano() >> 20
@@ -36,15 +36,15 @@ type guid int64
 type guidFactory struct {
 	sync.Mutex
 
-	workerID      int64
+	nodeID        int64
 	sequence      int64
 	lastTimestamp int64
 	lastID        guid
 }
 
-func NewGUIDFactory(workerID int64) *guidFactory {
+func NewGUIDFactory(nodeID int64) *guidFactory {
 	return &guidFactory{
-		workerID: workerID,
+		nodeID: nodeID,
 	}
 }
 
@@ -72,7 +72,7 @@ func (f *guidFactory) NewGUID() (guid, error) {
 	f.lastTimestamp = ts
 
 	id := guid(((ts - twepoch) << timestampShift) |
-		(f.workerID << workerIDShift) |
+		(f.nodeID << nodeIDShift) |
 		f.sequence)
 
 	if id <= f.lastID {
diff --git a/nsqd/nsqd.go b/nsqd/nsqd.go
index 018332691..55be82709 100644
--- a/nsqd/nsqd.go
+++ b/nsqd/nsqd.go
@@ -98,7 +98,7 @@ func New(opts *Options) *NSQD {
 	}
 
 	if opts.ID < 0 || opts.ID >= 1024 {
-		n.logf("FATAL: --worker-id must be [0,1024)")
+		n.logf("FATAL: --node-id must be [0,1024)")
 		os.Exit(1)
 	}
 
diff --git a/nsqd/options.go b/nsqd/options.go
index 6803a3a6b..02389ef51 100644
--- a/nsqd/options.go
+++ b/nsqd/options.go
@@ -12,7 +12,7 @@ import (
 
 type Options struct {
 	// basic options
-	ID                       int64         `flag:"worker-id" cfg:"id"`
+	ID                       int64         `flag:"node-id" cfg:"id"`
 	Verbose                  bool          `flag:"verbose"`
 	TCPAddress               string        `flag:"tcp-address"`
 	HTTPAddress              string        `flag:"http-address"`