From f436f88b6a8b283e469a2e9313c9370a8c0a52e9 Mon Sep 17 00:00:00 2001 From: Aphral Griffin Date: Wed, 15 Jan 2025 12:04:56 +0000 Subject: [PATCH] merge v3 --- internal/command/command_service.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/command/command_service.go b/internal/command/command_service.go index fda3c9506..bb7e92bf0 100644 --- a/internal/command/command_service.go +++ b/internal/command/command_service.go @@ -328,11 +328,11 @@ func (cs *CommandService) sendResponseForQueuedConfigApplyRequests( "response", newResponse, ) - backOffCtx, backoffCancel := context.WithTimeout(ctx, cs.agentConfig.Common.MaxElapsedTime) + backOffCtx, backoffCancel := context.WithTimeout(ctx, cs.agentConfig.Client.Backoff.MaxElapsedTime) err := backoff.Retry( cs.sendDataPlaneResponseCallback(ctx, newResponse), - backoffHelpers.Context(backOffCtx, cs.agentConfig.Common), + backoffHelpers.Context(backOffCtx, cs.agentConfig.Client.Backoff), ) if err != nil { slog.ErrorContext(ctx, "Failed to send data plane response", "error", err)