From 3f01f4504d109d5b3a5ab12804a993630a9c6558 Mon Sep 17 00:00:00 2001 From: Nate Del Duca Date: Sun, 20 Apr 2025 22:50:42 -0400 Subject: [PATCH] adding more rpc logging --- internal/app/app_rpc.go | 10 ++++++++++ internal/rpc/rpc.go | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/internal/app/app_rpc.go b/internal/app/app_rpc.go index 8136363..8849c2d 100644 --- a/internal/app/app_rpc.go +++ b/internal/app/app_rpc.go @@ -45,6 +45,8 @@ func (s *grpcServer) authInterceptor( handler grpc.UnaryHandler, ) (interface{}, error) { + s.app.Log.Info("RPC incoming request", "req", req) + md, _ := metadata.FromIncomingContext(ctx) auth := md["Authorization"] if len(auth) == 0 { @@ -59,6 +61,8 @@ func (s *grpcServer) authInterceptor( func (s *grpcServer) Add(ctx context.Context, req *pb.ProxyRequest) (*pb.Empty, error) { + s.app.Log.Info("RPC add new request", "req", req) + err := s.app.Kube.AddNewProxy(models.AddNewProxy{ From: req.From, To: req.To, Cert: req.Cert, Key: req.Key, }, s.app.namespace, s.app.name) @@ -71,6 +75,8 @@ func (s *grpcServer) Add(ctx context.Context, req *pb.ProxyRequest) (*pb.Empty, func (s *grpcServer) Update(ctx context.Context, req *pb.ProxyRequest) (*pb.Empty, error) { + s.app.Log.Info("RPC update request", "req", req) + if err := s.app.Kube.DeleteProxy(s.app.namespace, req.From); err != nil { return nil, err } @@ -86,6 +92,8 @@ func (s *grpcServer) Update(ctx context.Context, req *pb.ProxyRequest) (*pb.Empt func (s *grpcServer) Delete(ctx context.Context, req *pb.DeleteRequest) (*pb.Empty, error) { + s.app.Log.Info("RPC delete request", "req", req) + if err := s.app.Kube.DeleteProxy(s.app.namespace, req.From); err != nil { return nil, err } @@ -95,6 +103,8 @@ func (s *grpcServer) Delete(ctx context.Context, req *pb.DeleteRequest) (*pb.Emp func (s *grpcServer) List(ctx context.Context, _ *pb.ListRequest) (*pb.ListResponse, error) { + s.app.Log.Info("RPC list request") + records, _ := s.app.getAllRedirectionRecords() resp := &pb.ListResponse{} for from, to := range records { diff --git a/internal/rpc/rpc.go b/internal/rpc/rpc.go index ece9504..267452f 100644 --- a/internal/rpc/rpc.go +++ b/internal/rpc/rpc.go @@ -113,12 +113,21 @@ func Run(args []string) { } if subcmd == "add" { _, err = client.Add(ctx, req) + if err != nil { + log.Error("Error adding redirection record", "err", err) + } } else { _, err = client.Update(ctx, req) + if err != nil { + log.Error("Error updating redirection record", "err", err) + } } case "delete": _, err = client.Delete(ctx, &pb.DeleteRequest{From: *from}) + if err != nil { + log.Error("Error deleting redirection record", "err", err) + } case "list": resp, err := client.List(ctx, &pb.ListRequest{}) @@ -126,11 +135,15 @@ func Run(args []string) { for _, r := range resp.Records { log.Infof("%s -> %s\n", r.From, r.To) } + } else { + log.Error("Error retrieving list of redirection records:", "err", err) + } + if len(resp.Records) < 1 { + log.Info("No records found") } } if err != nil { log.Fatal(err) } - log.Info("OK") }