Refactor DeleteListenerWaf method to improve logging by including listenerName...

Refactor DeleteListenerWaf method to improve logging by including listenerName in the deferred function. This change enhances clarity in history logging while maintaining existing functionality.

internal/service/waf.go

@@ -305,10 +305,6 @@ func (s *wafService) DeleteListenerWaf(ctx context.Context, req *DeleteListenerR
 
 	name := fmt.Sprintf("%s-%d", req.GatewayName, req.Port)
 
-	defer func() {
-		_ = s.addListenerHistory(ctx, name, listenerName, req.GatewayName, req.Namespace, req.RegionCode, errMsg, status, model.OperationDelete)
-	}()
-
 	client := s.clusterClientManager.GetClient(req.RegionCode)
 	if client == nil {
 		status = 1 // Failure
@@ -324,6 +320,11 @@ func (s *wafService) DeleteListenerWaf(ctx context.Context, req *DeleteListenerR
 	}
 	listenerName = service.Spec.ServiceName
 
+	defer func() {
+		log.Info().Msgf("listenerName: %s", listenerName)
+		_ = s.addListenerHistory(ctx, name, listenerName, req.GatewayName, req.Namespace, req.RegionCode, errMsg, status, model.OperationDelete)
+	}()
+
 	if err := client.Versioned.WafV1alpha1().Services(req.Namespace).Delete(ctx, name, metav1.DeleteOptions{}); err != nil {
 		status = 1 // Failure
 		errMsg = fmt.Sprintf("failed to delete WAF service: %v", err)