merge v3

nginx · Jan 15, 2025 · f436f88 · f436f88
1 parent bd04da7
commit f436f88
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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)