Merge pull request #651 from jehiah/nsqadmin_deferred_651

nsqadmin: fix deferred message count
nsqio · Sep 21, 2015 · 094cf92 · 094cf92
2 parents d3e10cc + bedc5e3
commit 094cf92
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/internal/clusterinfo/types.go b/internal/clusterinfo/types.go
@@ -147,7 +147,7 @@ type ChannelStats struct {
 	MemoryDepth   int64           `json:"memory_depth"`
 	BackendDepth  int64           `json:"backend_depth"`
 	InFlightCount int64           `json:"in_flight_count"`
-	DeferredCount int64           `json:"defer_count"`
+	DeferredCount int64           `json:"deferred_count"`
 	RequeueCount  int64           `json:"requeue_count"`
 	TimeoutCount  int64           `json:"timeout_count"`
 	MessageCount  int64           `json:"message_count"`

diff --git a/nsqadmin/bindata.go b/nsqadmin/bindata.go
diff --git a/nsqadmin/http_test.go b/nsqadmin/http_test.go
@@ -223,7 +223,7 @@ func TestHTTPChannelGET(t *testing.T) {
 	equal(t, js.Get("message_count").MustInt(), 0)
 	equal(t, js.Get("paused").MustBool(), false)
 	equal(t, js.Get("in_flight_count").MustInt(), 0)
-	equal(t, js.Get("defer_count").MustInt(), 0)
+	equal(t, js.Get("deferred_count").MustInt(), 0)
 	equal(t, js.Get("requeue_count").MustInt(), 0)
 	equal(t, js.Get("timeout_count").MustInt(), 0)
 	equal(t, len(js.Get("clients").MustArray()), 0)
@@ -263,7 +263,7 @@ func TestHTTPNodesSingleGET(t *testing.T) {
 	equal(t, testTopic.Get("message_count").MustInt(), 0)
 	equal(t, testTopic.Get("paused").MustBool(), false)
 	equal(t, testTopic.Get("in_flight_count").MustInt(), 0)
-	equal(t, testTopic.Get("defer_count").MustInt(), 0)
+	equal(t, testTopic.Get("deferred_count").MustInt(), 0)
 	equal(t, testTopic.Get("requeue_count").MustInt(), 0)
 	equal(t, testTopic.Get("timeout_count").MustInt(), 0)
 }

diff --git a/nsqadmin/static/js/views/topic.hbs b/nsqadmin/static/js/views/topic.hbs
@@ -182,7 +182,7 @@
                 <td>{{commafy depth}}</td>
                 <td>{{commafy memory_depth}} + {{commafy backend_depth}}</td>
                 <td>{{commafy in_flight_count}}</td>
-                <td>{{commafy defer_count}}</td>
+                <td>{{commafy deferred_count}}</td>
                 <td>{{commafy requeue_count}}</td>
                 <td>{{commafy timeout_count}}</td>
                 <td>{{commafy message_count}}</td>