Add NS to error messages

hashicorp · Jun 13, 2022 · c96847c · c96847c
1 parent ae5920e
commit c96847c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/agent/rpc/peering/replication.go b/agent/rpc/peering/replication.go
@@ -342,7 +342,8 @@ func (s *Service) handleUpdateService(
 				PeerName:       peerName,
 			})
 			if err != nil {
-				ident := fmt.Sprintf("partition:%s/peer:%s/node:%s/service_id:%s", csn.Service.PartitionOrDefault(), peerName, csn.Node.Node, csn.Service.ID)
+				ident := fmt.Sprintf("partition:%s/peer:%s/node:%s/ns:%s/service_id:%s",
+					csn.Service.PartitionOrDefault(), peerName, csn.Node.Node, csn.Service.NamespaceOrDefault(), csn.Service.ID)
 				return fmt.Errorf("failed to deregister service %q: %w", ident, err)
 			}
 
@@ -375,7 +376,8 @@ func (s *Service) handleUpdateService(
 					PeerName:       peerName,
 				})
 				if err != nil {
-					ident := fmt.Sprintf("partition:%s/peer:%s/node:%s/check_id:%s", chk.PartitionOrDefault(), peerName, chk.Node, chk.CheckID)
+					ident := fmt.Sprintf("partition:%s/peer:%s/node:%s/ns:%s/check_id:%s",
+						chk.PartitionOrDefault(), peerName, chk.Node, chk.NamespaceOrDefault(), chk.CheckID)
 					return fmt.Errorf("failed to deregister check %q: %w", ident, err)
 				}
 			}