diff --git a/src/hooks/dhcp/high_availability/ha_messages.cc b/src/hooks/dhcp/high_availability/ha_messages.cc index 3167aaf4a7..65813e6372 100644 --- a/src/hooks/dhcp/high_availability/ha_messages.cc +++ b/src/hooks/dhcp/high_availability/ha_messages.cc @@ -1,4 +1,4 @@ -// File created from ../../../../src/hooks/dhcp/high_availability/ha_messages.mes on Mon May 18 2020 11:51 +// File created from ../../../../src/hooks/dhcp/high_availability/ha_messages.mes on Mon May 18 2020 16:44 #include #include @@ -101,7 +101,7 @@ const char* values[] = { "HA_BUFFER6_RECEIVE_PACKET_OPTIONS_SKIPPED", "an error upacking an option, caused subsequent options to be skipped: %1", "HA_BUFFER6_RECEIVE_UNPACK_FAILED", "failed to parse query from %1 to %2, received over interface %3, reason: %4", "HA_COMMAND_PROCESSED_FAILED", "command_processed callout failed: %1", - "HA_COMMUNICATION_INTERRUPTED", "communication is interrupted and failover process has been started", + "HA_COMMUNICATION_INTERRUPTED", "communication with %1 is interrupted", "HA_COMMUNICATION_INTERRUPTED_CLIENT4", "%1: new client attempting to get a lease from the partner", "HA_COMMUNICATION_INTERRUPTED_CLIENT4_UNACKED", "%1: partner server failed to respond, %2 clients unacked so far, %3 clients left before transitioning to the partner-down state", "HA_COMMUNICATION_INTERRUPTED_CLIENT6", "%1: new client attempting to get a lease from the partner", diff --git a/src/hooks/dhcp/high_availability/ha_messages.h b/src/hooks/dhcp/high_availability/ha_messages.h index ca6769b8d3..d1f6f67a75 100644 --- a/src/hooks/dhcp/high_availability/ha_messages.h +++ b/src/hooks/dhcp/high_availability/ha_messages.h @@ -1,4 +1,4 @@ -// File created from ../../../../src/hooks/dhcp/high_availability/ha_messages.mes on Mon May 18 2020 11:51 +// File created from ../../../../src/hooks/dhcp/high_availability/ha_messages.mes on Mon May 18 2020 16:44 #ifndef HA_MESSAGES_H #define HA_MESSAGES_H diff --git a/src/hooks/dhcp/high_availability/ha_messages.mes b/src/hooks/dhcp/high_availability/ha_messages.mes index 4c8f757fb5..a8b16a226a 100644 --- a/src/hooks/dhcp/high_availability/ha_messages.mes +++ b/src/hooks/dhcp/high_availability/ha_messages.mes @@ -58,7 +58,7 @@ reason for failure. This error message is issued when the callout for the command_processed hook point failed. The argument contains a reason for the error. -% HA_COMMUNICATION_INTERRUPTED communication is interrupted and failover process has been started +% HA_COMMUNICATION_INTERRUPTED communication with %1 is interrupted This warning message is issued by the server which discovered that the communication to the active partner has been interrupted for a time period longer than the configured heartbeat-delay time. At this stage diff --git a/src/hooks/dhcp/high_availability/ha_service.cc b/src/hooks/dhcp/high_availability/ha_service.cc index a5ae0a93e8..1dbed9dfaf 100644 --- a/src/hooks/dhcp/high_availability/ha_service.cc +++ b/src/hooks/dhcp/high_availability/ha_service.cc @@ -1351,7 +1351,8 @@ HAService::asyncSendHeartbeat() { communication_state_->setPartnerState("unavailable"); // Log if the communication is interrupted. if (communication_state_->isCommunicationInterrupted()) { - LOG_WARN(ha_logger, HA_COMMUNICATION_INTERRUPTED); + LOG_WARN(ha_logger, HA_COMMUNICATION_INTERRUPTED) + .arg(partner_config->getName()); } }