From 0f62cf55bb6d96140ba720c893faee28b2561ea8 Mon Sep 17 00:00:00 2001 From: Aphral Griffin Date: Thu, 14 Aug 2025 11:41:58 +0100 Subject: [PATCH 1/2] update toolchain version --- api/grpc/mpi/v1/command.pb.go | 2 +- api/grpc/mpi/v1/common.pb.go | 2 +- api/grpc/mpi/v1/files.pb.go | 2 +- go.mod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/grpc/mpi/v1/command.pb.go b/api/grpc/mpi/v1/command.pb.go index 7c137c5e9..1c4fa9b0c 100644 --- a/api/grpc/mpi/v1/command.pb.go +++ b/api/grpc/mpi/v1/command.pb.go @@ -8,7 +8,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc (unknown) // source: mpi/v1/command.proto diff --git a/api/grpc/mpi/v1/common.pb.go b/api/grpc/mpi/v1/common.pb.go index 9ba42f536..26b95bf14 100644 --- a/api/grpc/mpi/v1/common.pb.go +++ b/api/grpc/mpi/v1/common.pb.go @@ -5,7 +5,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc (unknown) // source: mpi/v1/common.proto diff --git a/api/grpc/mpi/v1/files.pb.go b/api/grpc/mpi/v1/files.pb.go index 9ebb60f91..c68585426 100644 --- a/api/grpc/mpi/v1/files.pb.go +++ b/api/grpc/mpi/v1/files.pb.go @@ -5,7 +5,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.7 // protoc (unknown) // source: mpi/v1/files.proto diff --git a/go.mod b/go.mod index 1c1886634..704346f00 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/nginx/agent/v3 go 1.24.0 -toolchain go1.24.4 +toolchain go1.24.6 require ( buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.4-20250130201111-63bb56e20495.1 From e1a9e3120cfc2702dd215c20efa2975667b9de32 Mon Sep 17 00:00:00 2001 From: Aphral Griffin Date: Thu, 14 Aug 2025 14:25:44 +0100 Subject: [PATCH 2/2] fix log --- internal/resource/nginx_instance_operator.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/resource/nginx_instance_operator.go b/internal/resource/nginx_instance_operator.go index e25d2e35d..6a4a68229 100644 --- a/internal/resource/nginx_instance_operator.go +++ b/internal/resource/nginx_instance_operator.go @@ -137,10 +137,10 @@ func (i *NginxInstanceOperator) checkWorkers(ctx context.Context, instanceID str return } - slog.DebugContext(ctx, "Found parent process ID", "process_id", newPid) + slog.DebugContext(ctx, "Found parent process ID, checking NGINX worker processes have reloaded", + "process_id", newPid) err := backoff.WaitUntil(ctx, backoffSettings, func() error { - slog.Info(" ============ Checking NGINX worker processes have reloaded") currentWorkers := i.nginxProcessOperator.NginxWorkerProcesses(ctx, newPid) if len(currentWorkers) == 0 { return errors.New("waiting for NGINX worker processes")