options.go (nsq-1.2.0) | : | options.go (nsq-1.2.1) | ||
---|---|---|---|---|
skipping to change at line 26 | skipping to change at line 26 | |||
// basic options | // basic options | |||
ID int64 `flag:"node-id" cfg:"id"` | ID int64 `flag:"node-id" cfg:"id"` | |||
LogLevel lg.LogLevel `flag:"log-level"` | LogLevel lg.LogLevel `flag:"log-level"` | |||
LogPrefix string `flag:"log-prefix"` | LogPrefix string `flag:"log-prefix"` | |||
Logger Logger | Logger Logger | |||
TCPAddress string `flag:"tcp-address"` | TCPAddress string `flag:"tcp-address"` | |||
HTTPAddress string `flag:"http-address"` | HTTPAddress string `flag:"http-address"` | |||
HTTPSAddress string `flag:"https-address"` | HTTPSAddress string `flag:"https-address"` | |||
BroadcastAddress string `flag:"broadcast-address"` | BroadcastAddress string `flag:"broadcast-address"` | |||
BroadcastTCPPort int `flag:"broadcast-tcp-port"` | ||||
BroadcastHTTPPort int `flag:"broadcast-http-port"` | ||||
NSQLookupdTCPAddresses []string `flag:"lookupd-tcp-address" cfg:"n sqlookupd_tcp_addresses"` | NSQLookupdTCPAddresses []string `flag:"lookupd-tcp-address" cfg:"n sqlookupd_tcp_addresses"` | |||
AuthHTTPAddresses []string `flag:"auth-http-address" cfg:"aut h_http_addresses"` | AuthHTTPAddresses []string `flag:"auth-http-address" cfg:"aut h_http_addresses"` | |||
HTTPClientConnectTimeout time.Duration `flag:"http-client-connect-timeout " cfg:"http_client_connect_timeout"` | HTTPClientConnectTimeout time.Duration `flag:"http-client-connect-timeout " cfg:"http_client_connect_timeout"` | |||
HTTPClientRequestTimeout time.Duration `flag:"http-client-request-timeout " cfg:"http_client_request_timeout"` | HTTPClientRequestTimeout time.Duration `flag:"http-client-request-timeout " cfg:"http_client_request_timeout"` | |||
// diskqueue options | // diskqueue options | |||
DataPath string `flag:"data-path"` | DataPath string `flag:"data-path"` | |||
MemQueueSize int64 `flag:"mem-queue-size"` | MemQueueSize int64 `flag:"mem-queue-size"` | |||
MaxBytesPerFile int64 `flag:"max-bytes-per-file"` | MaxBytesPerFile int64 `flag:"max-bytes-per-file"` | |||
SyncEvery int64 `flag:"sync-every"` | SyncEvery int64 `flag:"sync-every"` | |||
SyncTimeout time.Duration `flag:"sync-timeout"` | SyncTimeout time.Duration `flag:"sync-timeout"` | |||
QueueScanInterval time.Duration | QueueScanInterval time.Duration | |||
QueueScanRefreshInterval time.Duration | QueueScanRefreshInterval time.Duration | |||
QueueScanSelectionCount int | QueueScanSelectionCount int `flag:"queue-scan-selection-count"` | |||
QueueScanWorkerPoolMax int | QueueScanWorkerPoolMax int `flag:"queue-scan-worker-pool-max"` | |||
QueueScanDirtyPercent float64 | QueueScanDirtyPercent float64 | |||
// msg and command options | // msg and command options | |||
MsgTimeout time.Duration `flag:"msg-timeout"` | MsgTimeout time.Duration `flag:"msg-timeout"` | |||
MaxMsgTimeout time.Duration `flag:"max-msg-timeout"` | MaxMsgTimeout time.Duration `flag:"max-msg-timeout"` | |||
MaxMsgSize int64 `flag:"max-msg-size"` | MaxMsgSize int64 `flag:"max-msg-size"` | |||
MaxBodySize int64 `flag:"max-body-size"` | MaxBodySize int64 `flag:"max-body-size"` | |||
MaxReqTimeout time.Duration `flag:"max-req-timeout"` | MaxReqTimeout time.Duration `flag:"max-req-timeout"` | |||
ClientTimeout time.Duration | ClientTimeout time.Duration | |||
// client overridable configuration options | // client overridable configuration options | |||
MaxHeartbeatInterval time.Duration `flag:"max-heartbeat-interval"` | MaxHeartbeatInterval time.Duration `flag:"max-heartbeat-interval"` | |||
MaxRdyCount int64 `flag:"max-rdy-count"` | MaxRdyCount int64 `flag:"max-rdy-count"` | |||
MaxOutputBufferSize int64 `flag:"max-output-buffer-size"` | MaxOutputBufferSize int64 `flag:"max-output-buffer-size"` | |||
MaxOutputBufferTimeout time.Duration `flag:"max-output-buffer-timeout"` | MaxOutputBufferTimeout time.Duration `flag:"max-output-buffer-timeout"` | |||
MinOutputBufferTimeout time.Duration `flag:"min-output-buffer-timeout"` | MinOutputBufferTimeout time.Duration `flag:"min-output-buffer-timeout"` | |||
OutputBufferTimeout time.Duration `flag:"output-buffer-timeout"` | OutputBufferTimeout time.Duration `flag:"output-buffer-timeout"` | |||
MaxChannelConsumers int `flag:"max-channel-consumers"` | MaxChannelConsumers int `flag:"max-channel-consumers"` | |||
// statsd integration | // statsd integration | |||
StatsdAddress string `flag:"statsd-address"` | StatsdAddress string `flag:"statsd-address"` | |||
StatsdPrefix string `flag:"statsd-prefix"` | StatsdPrefix string `flag:"statsd-prefix"` | |||
StatsdInterval time.Duration `flag:"statsd-interval"` | StatsdInterval time.Duration `flag:"statsd-interval"` | |||
StatsdMemStats bool `flag:"statsd-mem-stats"` | StatsdMemStats bool `flag:"statsd-mem-stats"` | |||
StatsdUDPPacketSize int `flag:"statsd-udp-packet-size"` | StatsdUDPPacketSize int `flag:"statsd-udp-packet-size"` | |||
StatsdExcludeEphemeral bool `flag:"statsd-exclude-ephemeral"` | ||||
// e2e message latency | // e2e message latency | |||
E2EProcessingLatencyWindowTime time.Duration `flag:"e2e-processing-laten cy-window-time"` | E2EProcessingLatencyWindowTime time.Duration `flag:"e2e-processing-laten cy-window-time"` | |||
E2EProcessingLatencyPercentiles []float64 `flag:"e2e-processing-laten cy-percentile" cfg:"e2e_processing_latency_percentiles"` | E2EProcessingLatencyPercentiles []float64 `flag:"e2e-processing-laten cy-percentile" cfg:"e2e_processing_latency_percentiles"` | |||
// TLS config | // TLS config | |||
TLSCert string `flag:"tls-cert"` | TLSCert string `flag:"tls-cert"` | |||
TLSKey string `flag:"tls-key"` | TLSKey string `flag:"tls-key"` | |||
TLSClientAuthPolicy string `flag:"tls-client-auth-policy"` | TLSClientAuthPolicy string `flag:"tls-client-auth-policy"` | |||
TLSRootCAFile string `flag:"tls-root-ca-file"` | TLSRootCAFile string `flag:"tls-root-ca-file"` | |||
skipping to change at line 101 | skipping to change at line 104 | |||
h := md5.New() | h := md5.New() | |||
io.WriteString(h, hostname) | io.WriteString(h, hostname) | |||
defaultID := int64(crc32.ChecksumIEEE(h.Sum(nil)) % 1024) | defaultID := int64(crc32.ChecksumIEEE(h.Sum(nil)) % 1024) | |||
return &Options{ | return &Options{ | |||
ID: defaultID, | ID: defaultID, | |||
LogPrefix: "[nsqd] ", | LogPrefix: "[nsqd] ", | |||
LogLevel: lg.INFO, | LogLevel: lg.INFO, | |||
TCPAddress: "0.0.0.0:4150", | TCPAddress: "0.0.0.0:4150", | |||
HTTPAddress: "0.0.0.0:4151", | HTTPAddress: "0.0.0.0:4151", | |||
HTTPSAddress: "0.0.0.0:4152", | HTTPSAddress: "0.0.0.0:4152", | |||
BroadcastAddress: hostname, | BroadcastAddress: hostname, | |||
BroadcastTCPPort: 0, | ||||
BroadcastHTTPPort: 0, | ||||
NSQLookupdTCPAddresses: make([]string, 0), | NSQLookupdTCPAddresses: make([]string, 0), | |||
AuthHTTPAddresses: make([]string, 0), | AuthHTTPAddresses: make([]string, 0), | |||
HTTPClientConnectTimeout: 2 * time.Second, | HTTPClientConnectTimeout: 2 * time.Second, | |||
HTTPClientRequestTimeout: 5 * time.Second, | HTTPClientRequestTimeout: 5 * time.Second, | |||
MemQueueSize: 10000, | MemQueueSize: 10000, | |||
MaxBytesPerFile: 100 * 1024 * 1024, | MaxBytesPerFile: 100 * 1024 * 1024, | |||
SyncEvery: 2500, | SyncEvery: 2500, | |||
End of changes. 4 change blocks. | ||||
11 lines changed or deleted | 16 lines changed or added |