apps/kubevpn
1
0
Fork 0
mirror of https://github.com/kubenetworks/kubevpn.git synced 2025-12-24 11:51:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: divide log to session and backend (#487)

Browse Source 
* refactor: divide log to session and backend
This commit is contained in:
naison
2025-03-23 13:59:10 +08:00
committed by GitHub
parent a5622b9439
commit b46f7a9877
107 changed files with 873 additions and 871 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controlplane/cache.go
View File

@@ -26,7 +26,7 @@ import (
"github.com/envoyproxy/go-control-plane/pkg/cache/types"
"github.com/envoyproxy/go-control-plane/pkg/resource/v3"
"github.com/envoyproxy/go-control-plane/pkg/wellknown"
"github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/anypb"
"google.golang.org/protobuf/types/known/durationpb"
@@ -90,7 +90,7 @@ type Rule struct {
PortMap map[int32]string
}
func (a *Virtual) To(enableIPv6 bool) (
func (a *Virtual) To(enableIPv6 bool, logger *log.Logger) (
listeners []types.Resource,
clusters []types.Resource,
routes []types.Resource,
@@ -117,7 +117,7 @@ func (a *Virtual) To(enableIPv6 bool) (
if strings.Index(ports, ":") > 0 {
ports = strings.Split(ports, ":")[0]
} else {
logrus.Errorf("fargate mode port should have two pair")
logger.Errorf("fargate mode port should have two pair: %s", ports)
}
}
envoyRulePort, _ := strconv.Atoi(ports)

4
pkg/controlplane/main.go
View File

@@ -8,6 +8,8 @@ import (
serverv3 "github.com/envoyproxy/go-control-plane/pkg/server/v3"
"github.com/fsnotify/fsnotify"
log "github.com/sirupsen/logrus"
plog "github.com/wencaiwulue/kubevpn/v2/pkg/log"
)
func Main(ctx context.Context, filename string, port uint, logger *log.Logger) error {
@@ -46,7 +48,7 @@ func Main(ctx context.Context, filename string, port uint, logger *log.Logger) e
case msg := <-notifyCh:
err = proc.ProcessFile(msg)
if err != nil {
log.Errorf("Failed to process file: %v", err)
plog.G(ctx).Errorf("Failed to process file: %v", err)
return err
}
case err = <-errChan:

2
pkg/controlplane/processor.go
View File

@@ -65,7 +65,7 @@ func (p *Processor) ProcessFile(file NotifyMessage) error {
}
p.logger.Debugf("update config, version %d, config %v", p.version, config)
listeners, clusters, routes, endpoints := config.To(enableIPv6)
listeners, clusters, routes, endpoints := config.To(enableIPv6, p.logger)
resources := map[resource.Type][]types.Resource{
resource.ListenerType: listeners, // listeners
resource.RouteType: routes, // routes

5
pkg/controlplane/server.go
View File

@@ -13,8 +13,9 @@ import (
runtimeservice "github.com/envoyproxy/go-control-plane/envoy/service/runtime/v3"
secretservice "github.com/envoyproxy/go-control-plane/envoy/service/secret/v3"
serverv3 "github.com/envoyproxy/go-control-plane/pkg/server/v3"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"
plog "github.com/wencaiwulue/kubevpn/v2/pkg/log"
)
const (
@@ -38,6 +39,6 @@ func RunServer(ctx context.Context, server serverv3.Server, port uint) error {
secretservice.RegisterSecretDiscoveryServiceServer(grpcServer, server)
runtimeservice.RegisterRuntimeDiscoveryServiceServer(grpcServer, server)
log.Infof("Management server listening on %d", port)
plog.G(ctx).Infof("Management server listening on %d", port)
return grpcServer.Serve(listener)
}