Browse Source

bug fix for observer

Shelikhoo 4 years ago
parent
commit
ab803000e7
2 changed files with 3 additions and 3 deletions
  1. 2 2
      app/observatory/burst/burstobserver.go
  2. 1 1
      infra/conf/observatory.go

+ 2 - 2
app/observatory/burst/burstobserver.go

@@ -2,13 +2,13 @@ package burst
 
 import (
 	"context"
+	"github.com/golang/protobuf/proto"
 	core "github.com/v2fly/v2ray-core/v4"
 	"github.com/v2fly/v2ray-core/v4/app/observatory"
 	"github.com/v2fly/v2ray-core/v4/common"
 	"github.com/v2fly/v2ray-core/v4/common/signal/done"
 	"github.com/v2fly/v2ray-core/v4/features/extension"
 	"github.com/v2fly/v2ray-core/v4/features/outbound"
-	"google.golang.org/protobuf/proto"
 	"sync"
 )
 
@@ -34,7 +34,7 @@ func (o *Observer) createResult() []*observatory.OutboundStatus {
 	defer o.hp.access.Unlock()
 	for name, value := range o.hp.Results {
 		status := observatory.OutboundStatus{
-			Alive:           value.getStatistics().All == value.getStatistics().Fail,
+			Alive:           value.getStatistics().All != value.getStatistics().Fail,
 			Delay:           value.getStatistics().Average.Milliseconds(),
 			LastErrorReason: "",
 			OutboundTag:     name,

+ 1 - 1
infra/conf/observatory.go

@@ -28,7 +28,7 @@ type BurstObservatoryConfig struct {
 }
 
 func (b BurstObservatoryConfig) Build() (proto.Message, error) {
-	if result, err := b.HealthCheck.Build(); err != nil {
+	if result, err := b.HealthCheck.Build(); err == nil {
 		return &burst.Config{SubjectSelector: b.SubjectSelector, PingConfig: result.(*burst.HealthPingConfig)}, nil
 	} else {
 		return nil, err