Merge pull request #753 from jehiah/nsqadmin_fix_753

nsqadmin: missing channel from topic list
nsqio · Jul 31, 2018 · f0dd3c3 · f0dd3c3
2 parents bd122fc + 598e111
commit f0dd3c3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/internal/clusterinfo/types.go b/internal/clusterinfo/types.go
@@ -115,8 +115,8 @@ func (t *TopicStats) Add(a *TopicStats) {
 	if a.Paused {
 		t.Paused = a.Paused
 	}
-	found := false
 	for _, aChannelStats := range a.Channels {
+		found := false
 		for _, channelStats := range t.Channels {
 			if aChannelStats.ChannelName == channelStats.ChannelName {
 				found = true

diff --git a/nsqadmin/bindata.go b/nsqadmin/bindata.go
diff --git a/nsqadmin/static/js/views/topic.hbs b/nsqadmin/static/js/views/topic.hbs
@@ -81,7 +81,7 @@
             {{#if ../graph_active}}
                 <td class="bold rate" target="{{rate "topic" node topic_name ""}}"></td>
             {{/if}}
-            <td>{{commafy ../channels.length}}</td>
+            <td>{{commafy this/channels.length}}</td>
             {{#if e2e_processing_latency.percentiles.length}}
                 {{#each e2e_processing_latency.percentiles}}
                 <td>