mirror of
https://github.com/XTLS/Xray-core.git
synced 2024-11-05 04:29:19 +02:00
fix: expvar error when observatory is not enabled & various typos
This commit is contained in:
parent
70306c4ec8
commit
755268b7d4
|
@ -64,6 +64,9 @@ func NewMetricsHandler(ctx context.Context, config *Config) (*MetricsHandler, er
|
||||||
c.observatory = observatory
|
c.observatory = observatory
|
||||||
return nil
|
return nil
|
||||||
}))
|
}))
|
||||||
|
if c.observatory == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
}
|
}
|
||||||
var resp = map[string]*observatory.OutboundStatus{}
|
var resp = map[string]*observatory.OutboundStatus{}
|
||||||
if o, err := c.observatory.GetObservation(context.Background()); err != nil {
|
if o, err := c.observatory.GetObservation(context.Background()); err != nil {
|
||||||
|
|
|
@ -11,7 +11,7 @@ import (
|
||||||
"github.com/xtls/xray-core/transport"
|
"github.com/xtls/xray-core/transport"
|
||||||
)
|
)
|
||||||
|
|
||||||
// OutboundListener is a net.Listener for listening pprof http connections.
|
// OutboundListener is a net.Listener for listening metrics http connections.
|
||||||
type OutboundListener struct {
|
type OutboundListener struct {
|
||||||
buffer chan net.Conn
|
buffer chan net.Conn
|
||||||
done *done.Instance
|
done *done.Instance
|
||||||
|
@ -60,7 +60,7 @@ func (l *OutboundListener) Addr() net.Addr {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Outbound is a outbound.Handler that handles pprof http connections.
|
// Outbound is an outbound.Handler that handles metrics http connections.
|
||||||
type Outbound struct {
|
type Outbound struct {
|
||||||
tag string
|
tag string
|
||||||
listener *OutboundListener
|
listener *OutboundListener
|
||||||
|
|
|
@ -25,11 +25,11 @@ type Counter interface {
|
||||||
//
|
//
|
||||||
// xray:api:stable
|
// xray:api:stable
|
||||||
type Channel interface {
|
type Channel interface {
|
||||||
// Channel is a runnable unit.
|
// Runnable implies that Channel is a runnable unit.
|
||||||
common.Runnable
|
common.Runnable
|
||||||
// Publish broadcasts a message through the channel with a controlling context.
|
// Publish broadcasts a message through the channel with a controlling context.
|
||||||
Publish(context.Context, interface{})
|
Publish(context.Context, interface{})
|
||||||
// SubscriberCount returns the number of the subscribers.
|
// Subscribers returns all subscribers.
|
||||||
Subscribers() []chan interface{}
|
Subscribers() []chan interface{}
|
||||||
// Subscribe registers for listening to channel stream and returns a new listener channel.
|
// Subscribe registers for listening to channel stream and returns a new listener channel.
|
||||||
Subscribe() (chan interface{}, error)
|
Subscribe() (chan interface{}, error)
|
||||||
|
@ -47,7 +47,7 @@ func SubscribeRunnableChannel(c Channel) (chan interface{}, error) {
|
||||||
return c.Subscribe()
|
return c.Subscribe()
|
||||||
}
|
}
|
||||||
|
|
||||||
// UnsubscribeClosableChannel unsubcribes the channel and close it if there is no more subscriber.
|
// UnsubscribeClosableChannel unsubscribes the channel and close it if there is no more subscriber.
|
||||||
func UnsubscribeClosableChannel(c Channel, sub chan interface{}) error {
|
func UnsubscribeClosableChannel(c Channel, sub chan interface{}) error {
|
||||||
if err := c.Unsubscribe(sub); err != nil {
|
if err := c.Unsubscribe(sub); err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -73,7 +73,7 @@ type Manager interface {
|
||||||
|
|
||||||
// RegisterChannel registers a new channel to the manager. The identifier string must not be empty, and unique among other channels.
|
// RegisterChannel registers a new channel to the manager. The identifier string must not be empty, and unique among other channels.
|
||||||
RegisterChannel(string) (Channel, error)
|
RegisterChannel(string) (Channel, error)
|
||||||
// UnregisterCounter unregisters a channel from the manager by its identifier.
|
// UnregisterChannel unregisters a channel from the manager by its identifier.
|
||||||
UnregisterChannel(string) error
|
UnregisterChannel(string) error
|
||||||
// GetChannel returns a channel by its identifier.
|
// GetChannel returns a channel by its identifier.
|
||||||
GetChannel(string) Channel
|
GetChannel(string) Channel
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package scenarios
|
package scenarios
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
@ -99,7 +100,8 @@ func TestMetrics(t *testing.T) {
|
||||||
if err2 != nil {
|
if err2 != nil {
|
||||||
t.Fatal(err2)
|
t.Fatal(err2)
|
||||||
}
|
}
|
||||||
if string(body2)[0] != '{' {
|
var json2 map[string]interface{}
|
||||||
|
if json.Unmarshal(body2, &json2) != nil {
|
||||||
t.Error("unexpected response body from expvars handler")
|
t.Error("unexpected response body from expvars handler")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue