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: display errors #421

Merged
merged 12 commits into from
Sep 17, 2015
Merged

nsqadmin: display errors #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
58969a9
internal/clusterinfo: return PartialErr
mreiferson Aug 29, 2015
c04ad5e
internal/clusterinfo: sort clients, topics, channels by hostname
mreiferson Sep 12, 2015
b4381f1
nsqadmin: add favicon
mreiferson Sep 7, 2015
71e4404
nsqadmin: fix counter removal issues
mreiferson Sep 7, 2015
362bcaf
nsqadmin: fix memory depth is always 0
mreiferson Sep 7, 2015
6660aff
nsqadmin: send version with UserAgent
mreiferson Sep 11, 2015
dae9a12
nsqadmin: eslint fixes
mreiferson Sep 11, 2015
97c6e02
internal/quantile: fix JSON decoding
mreiferson Sep 12, 2015
9de4d41
nsqadmin: round times to 2 decimal points
mreiferson Sep 12, 2015
7f5040e
nsqadmin: fix column count on /topic
mreiferson Sep 12, 2015
84dd20b
nsqadmin: handle/display AJAX errors
mreiferson Sep 12, 2015
b6e463a
nsqadmin: bin dater
mreiferson Sep 12, 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
8 changes: 4 additions & 4 deletions apps/nsq_stat/nsq_stat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,19 @@ func statLoop(interval time.Duration, topic string, channel string,
ci := clusterinfo.New(nil, http_api.NewClient(nil))
var o *clusterinfo.ChannelStats
for i := 0; !countNum.isSet || countNum.value >= i; i++ {
var producerList clusterinfo.ProducerList
var producers clusterinfo.Producers
var err error

if len(lookupdHTTPAddrs) != 0 {
producerList, err = ci.GetLookupdTopicProducers(topic, lookupdHTTPAddrs)
producers, err = ci.GetLookupdTopicProducers(topic, lookupdHTTPAddrs)
} else {
producerList, err = ci.GetNSQDTopicProducers(topic, nsqdHTTPAddrs)
producers, err = ci.GetNSQDTopicProducers(topic, nsqdHTTPAddrs)
}
if err != nil {
log.Fatalf("ERROR: failed to get topic producers - %s", err)
}

_, allChannelStats, err := ci.GetNSQDStats(producerList, topic)
_, allChannelStats, err := ci.GetNSQDStats(producers, topic)
if err != nil {
log.Fatalf("ERROR: failed to get nsqd stats - %s", err)
}
Expand Down
Loading