Skip to content

Commit

Permalink
no nsqadmin changes without topology info, udpate nsqd flag docs
Browse files Browse the repository at this point in the history
  • Loading branch information
zoemccormick committed Dec 15, 2023
1 parent 42d28f5 commit 88161cb
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
4 changes: 2 additions & 2 deletions apps/nsqd/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ func nsqdFlagSet(opts *nsqd.Options) *flag.FlagSet {
flagSet.Var(&lookupdTCPAddrs, "lookupd-tcp-address", "lookupd TCP address (may be given multiple times)")
flagSet.Duration("http-client-connect-timeout", opts.HTTPClientConnectTimeout, "timeout for HTTP connect")
flagSet.Duration("http-client-request-timeout", opts.HTTPClientRequestTimeout, "timeout for HTTP request")
flagSet.String("topology-region", opts.TopologyRegion, "A region represents a larger domain, made up of one or more zones")
flagSet.String("topology-zone", opts.TopologyZone, "A zone represents a logical failure domain")
flagSet.String("topology-region", opts.TopologyRegion, "A region represents a larger domain, made up of one or more zones for preferring closer consumer")
flagSet.String("topology-zone", opts.TopologyZone, "A zone represents a logical failure domain for preferring closer consumer")

// diskqueue options
flagSet.String("data-path", opts.DataPath, "path to store disk-backed messages")
Expand Down
2 changes: 1 addition & 1 deletion nsqadmin/static/build/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion nsqadmin/static/build/main.js.map

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions nsqadmin/static/js/views/channel.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
<th>Connected</th>
</tr>
{{#each clients}}
<tr style={{#if (eq topology_zone node_topology_zone)}}"background-color:rgb(221,255,221)"{{/if}}{{#if (eq topology_region node_topology_region)}}"background-color:rgb(254,254,194)"{{/if}}>
<tr style={{#if (and (node_topology_zone) (eq topology_zone node_topology_zone))}}"background-color:rgb(221,255,221)"{{/if}}{{#if (and (node_topology_region) (eq topology_region node_topology_region))}}"background-color:rgb(254,254,194)"{{/if}}>
<td title="{{remote_address}}">{{hostname_port}}{{#if show_client_id}} ({{client_id}}){{/if}}</td>
<td>{{#if user_agent.length}}<small>{{user_agent}}</small>{{/if}}</td>
<td>
Expand Down Expand Up @@ -215,10 +215,14 @@
{{#if topology_zone}}
<span class="label label-default">{{topology_zone}}</span>
{{/if}}
{{#if (eq topology_zone node_topology_zone)}}
{{#if (and
(node_topology_zone)
(eq topology_zone node_topology_zone))}}
<span class="label label-default">zoneLocal</span>
{{else}}
{{#if (eq topology_region node_topology_region)}}
{{#if (and
(node_topology_region)
(eq topology_region node_topology_region))}}
<span class="label label-default">regionLocal</span>
{{/if}}
{{/if}}
Expand Down

0 comments on commit 88161cb

Please sign in to comment.