Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nsqadmin: fix deferred message count #651

Merged
merged 2 commits into from
Sep 21, 2015
Merged

nsqadmin: fix deferred message count #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86f69f8
nsqadmin: fix deferred count
jehiah Sep 21, 2015
bedc5e3
nsqadmin: compile static assets
jehiah Sep 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/clusterinfo/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
28 changes: 14 additions & 14 deletions nsqadmin/bindata.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions nsqadmin/http_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion nsqadmin/static/js/views/topic.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down