Rename queries to queryToMetricMap

This commit is contained in:
zhangyelong 2018-03-28 18:37:39 +08:00
parent 858cad05f1
commit 2914b73e30
1 changed files with 6 additions and 6 deletions

View File

@ -81,7 +81,7 @@ type EventMeter struct {
wsc *client.WSClient
mtx sync.Mutex
queries map[string]*EventMetric
queryToMetricMap map[string]*EventMetric
unmarshalEvent EventUnmarshalFunc
latencyCallback LatencyCallbackFunc
@ -96,7 +96,7 @@ type EventMeter struct {
func NewEventMeter(addr string, unmarshalEvent EventUnmarshalFunc) *EventMeter {
return &EventMeter{
wsc: client.NewWSClient(addr, "/websocket", client.PingPeriod(1*time.Second)),
queries: make(map[string]*EventMetric),
queryToMetricMap: make(map[string]*EventMetric),
unmarshalEvent: unmarshalEvent,
logger: log.NewNopLogger(),
}
@ -154,7 +154,7 @@ func (em *EventMeter) Subscribe(query string, cb EventCallbackFunc) error {
meter: metrics.NewMeter(),
callback: cb,
}
em.queries[query] = metric
em.queryToMetricMap[query] = metric
return nil
}
@ -173,7 +173,7 @@ func (em *EventMeter) Unsubscribe(query string) error {
func (em *EventMeter) GetMetric(query string) (*EventMetric, error) {
em.mtx.Lock()
defer em.mtx.Unlock()
metric, ok := em.queries[query]
metric, ok := em.queryToMetricMap[query]
if !ok {
return nil, fmt.Errorf("unknown query: %s", query)
}
@ -198,7 +198,7 @@ func (em *EventMeter) RegisterDisconnectCallback(f DisconnectCallbackFunc) {
// Private
func (em *EventMeter) subscribe() error {
for query, _ := range em.queries {
for query, _ := range em.queryToMetricMap {
if err := em.wsc.Subscribe(context.TODO(), query); err != nil {
return err
}
@ -259,7 +259,7 @@ func (em *EventMeter) updateMetric(query string, data events.EventData) {
em.mtx.Lock()
defer em.mtx.Unlock()
metric, ok := em.queries[query]
metric, ok := em.queryToMetricMap[query]
if !ok {
// we already unsubscribed, or got an unexpected query
return