Merge pull request #1134 from ploxiln/nsqadmin_client_count

nsqadmin: connections count fixes
nsqio · Feb 11, 2019 · cbdcd54 · cbdcd54
2 parents c3c364e + 69cdeba
commit cbdcd54
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 47 deletions.
diff --git a/nsqadmin/README.md b/nsqadmin/README.md
@@ -7,8 +7,9 @@ Read the [docs](http://nsq.io/components/nsqadmin.html)
 
 ## Working Locally
 
+ 0. install nodejs 8.x (includes npm)
  1. `$ npm install`
- 2. `$ ./gulp clean watch` or `$ ./gulp clean build`
+ 2. `$ ./gulp --series clean watch` or `$ ./gulp --series clean build`
  3. `$ go-bindata --debug --pkg=nsqadmin --prefix=static/build static/build/...`
  4. `$ go build && ./nsqadmin`
  5. make changes (repeat step 5 if you make changes to any Go code)

diff --git a/nsqadmin/bindata.go b/nsqadmin/bindata.go
diff --git a/nsqadmin/gulp b/nsqadmin/gulp
@@ -1,2 +1,2 @@
-#!/bin/bash
-exec ./node_modules/.bin/gulp $@
+#!/bin/sh
+exec ./node_modules/.bin/gulp "$@"
diff --git a/nsqadmin/static/js/views/channel.hbs b/nsqadmin/static/js/views/channel.hbs
@@ -91,7 +91,7 @@
             {{#if ../graph_active}}
                 <td class="bold rate" target="{{rate "topic" node topic_name ""}}"></td>
             {{/if}}
-            <td>{{commafy clients.length}}</td>
+            <td>{{commafy client_count}}</td>
             {{#if e2e_processing_latency.percentiles.length}}
                 {{#each e2e_processing_latency.percentiles}}
                 <td>
@@ -129,10 +129,10 @@
             <td>{{commafy requeue_count}}</td>
             <td>{{commafy timeout_count}}</td>
             <td>{{commafy message_count}}</td>
-            {{#if ../graph_active}}
+            {{#if graph_active}}
                 <td class="bold rate" target="{{rate "topic" node topic_name ""}}"></td>
             {{/if}}
-            <td>{{commafy clients.length}}</td>
+            <td>{{commafy client_count}}</td>
             {{#if e2e_processing_latency.percentiles.length}}
                 {{#each e2e_processing_latency.percentiles}}
                 <td>

diff --git a/nsqadmin/static/js/views/topic.hbs b/nsqadmin/static/js/views/topic.hbs
@@ -188,7 +188,7 @@
                 <td>{{commafy requeue_count}}</td>
                 <td>{{commafy timeout_count}}</td>
                 <td>{{commafy message_count}}</td>
-                <td>{{commafy clients.length}}</td>
+                <td>{{commafy client_count}}</td>
                 {{#if e2e_processing_latency.percentiles.length}}
                     {{#each e2e_processing_latency.percentiles}}
                     <td>