lzhr
/
v2fly
mirror of https://github.com/v2fly/v2ray-core.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix: observatory starts with empty config & fails to close (#957)

This commit is contained in:
Loyalsoldier 2021-05-01 22:28:23 +08:00 committed by GitHub
parent 411a50c8fa
commit 980fb59878
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/observatory/observer.go
View File

@ -44,13 +44,18 @@ func (o *Observer) Type() interface{} {
}
func (o *Observer) Start() error {
o.finished = done.New()
go o.background()
if o.config != nil && len(o.config.SubjectSelector) != 0 {
o.finished = done.New()
go o.background()
}
return nil
}
func (o *Observer) Close() error {
return o.finished.Close()
if o.finished != nil {
return o.finished.Close()
}
return nil
}
func (o *Observer) background() {

2
infra/conf/observatory.go
View File

@ -10,6 +10,6 @@ type ObservatoryConfig struct {
SubjectSelector []string `json:"subjectSelector"`
}
func (o ObservatoryConfig) Build() (proto.Message, error) {
func (o *ObservatoryConfig) Build() (proto.Message, error) {
return &observatory.Config{SubjectSelector: o.SubjectSelector}, nil
}