lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-02-20 23:47:21 -05:00
Code Issues Releases Wiki Activity

Fix: observatory log & JSON config(#1211)

Browse Source 
Co-authored-by: ihotte <ihotte@yeah.net>
This commit is contained in:
ihotte 2021-08-19 13:40:47 +08:00 committed by GitHub
parent e39a69e688
commit 8f429c35cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/observatory/observer.go
View File

@ -152,7 +152,7 @@ func (o *Observer) probe(outbound string) ProbeResult {
fullerr := newError("underlying connection failed").Base(errorCollectorForRequest.UnderlyingError())
fullerr = newError("with outbound handler report").Base(fullerr)
fullerr = newError("GET request failed:", err).Base(fullerr)
fullerr = newError("the outbound ", outbound, "is dead:").Base(fullerr)
fullerr = newError("the outbound ", outbound, " is dead:").Base(fullerr)
fullerr = fullerr.AtInfo()
fullerr.WriteToLog()
return ProbeResult{Alive: false, LastErrorReason: fullerr.Error()}

2
infra/conf/observatory.go
View File

@ -10,7 +10,7 @@ import (
type ObservatoryConfig struct {
SubjectSelector []string `json:"subjectSelector"`
ProbeURL string `json:"probeURL"`
ProbeInterval duration.Duration `json:"ProbeInterval"`
ProbeInterval duration.Duration `json:"probeInterval"`
}
func (o *ObservatoryConfig) Build() (proto.Message, error) {