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: JS error with no clients #642

Merged
merged 4 commits into from
Aug 27, 2015
Merged

nsqadmin: JS error with no clients #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdadc56
nsqd: return more metadata for /info
mreiferson Aug 26, 2015
acb4427
internal/clusterinfo: generate/propagate ProducerList
mreiferson Aug 26, 2015
f359686
nsqadmin: leverage ProducerList and nsqd/info to simplify, support ns…
mreiferson Aug 26, 2015
5bd6fa4
nsqadmin: fix no clients JR error; show hostname for 'NSQd Host'
mreiferson Aug 27, 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
13 changes: 4 additions & 9 deletions apps/nsq_stat/nsq_stat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"errors"
"flag"
"fmt"
"io/ioutil"
"log"
"os"
"os/signal"
Expand Down Expand Up @@ -60,23 +59,19 @@ func statLoop(interval time.Duration, topic string, channel string,
ci := clusterinfo.New(nil)
var o *clusterinfo.ChannelStats
for i := 0; !countNum.isSet || countNum.value >= i; i++ {
var producers []string
var producerList clusterinfo.ProducerList
var err error

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

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