Skip to content

Commit f0adba6

Browse files
General fixes
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
1 parent 378600c commit f0adba6

4 files changed

Lines changed: 17 additions & 8 deletions

File tree

ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant
218218
const TopicInfo& topic_info,
219219
ddspipe::core::types::DdsTopic& topic);
220220

221-
bool fullfill_service_type_nts_(
221+
bool fulfill_service_type_nts_(
222222
const ServiceInfo& service_info,
223223
std::shared_ptr<ServiceDiscovered> service,
224224
RpcProtocol RpcProtocol);

ddsenabler_participants/src/cpp/EnablerParticipant.cpp

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,8 @@ bool EnablerParticipant::send_service_request(
486486
json,
487487
request_id))
488488
{
489+
EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION,
490+
"Failed to send service request to service " << service_name);
489491
return false;
490492
}
491493

@@ -576,6 +578,8 @@ bool EnablerParticipant::announce_action(
576578
std::shared_ptr<ActionDiscovered> action = std::make_shared<ActionDiscovered>(action_name, RpcProtocol);
577579
if (!query_action_nts_(*action, RpcProtocol, lck))
578580
{
581+
EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT,
582+
"Failed to announce action " << action_name << " : action type request failed.");
579583
return false;
580584
}
581585

@@ -622,6 +626,8 @@ bool EnablerParticipant::revoke_action(
622626
return true;
623627
}
624628

629+
EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT,
630+
"Failed to stop action " << action_name << " : error revoking action services.");
625631
return false;
626632
}
627633

@@ -685,7 +691,7 @@ bool EnablerParticipant::fill_topic_struct_nts_(
685691
return true;
686692
}
687693

688-
bool EnablerParticipant::fullfill_service_type_nts_(
694+
bool EnablerParticipant::fulfill_service_type_nts_(
689695
const ServiceInfo& service_info,
690696
std::shared_ptr<ServiceDiscovered> service,
691697
RpcProtocol RpcProtocol)
@@ -762,7 +768,7 @@ bool EnablerParticipant::query_service_nts_(
762768
return false;
763769
}
764770

765-
return fullfill_service_type_nts_(service_info, service, RpcProtocol);
771+
return fulfill_service_type_nts_(service_info, service, RpcProtocol);
766772
}
767773

768774
bool EnablerParticipant::query_action_nts_(
@@ -809,7 +815,7 @@ bool EnablerParticipant::query_action_nts_(
809815

810816
std::shared_ptr<ServiceDiscovered> goal_service = std::make_shared<ServiceDiscovered>(goal_service_name,
811817
RpcProtocol);
812-
if (!fullfill_service_type_nts_(
818+
if (!fulfill_service_type_nts_(
813819
action_info.goal,
814820
goal_service,
815821
RpcProtocol))
@@ -829,7 +835,7 @@ bool EnablerParticipant::query_action_nts_(
829835

830836
std::shared_ptr<ServiceDiscovered> cancel_service = std::make_shared<ServiceDiscovered>(cancel_service_name,
831837
RpcProtocol);
832-
if (!fullfill_service_type_nts_(
838+
if (!fulfill_service_type_nts_(
833839
action_info.cancel,
834840
cancel_service,
835841
RpcProtocol))
@@ -849,7 +855,7 @@ bool EnablerParticipant::query_action_nts_(
849855

850856
std::shared_ptr<ServiceDiscovered> result_service = std::make_shared<ServiceDiscovered>(result_service_name,
851857
RpcProtocol);
852-
if (!fullfill_service_type_nts_(
858+
if (!fulfill_service_type_nts_(
853859
action_info.result,
854860
result_service,
855861
RpcProtocol))
@@ -1154,6 +1160,9 @@ bool EnablerParticipant::send_action_get_result_reply(
11541160
return true;
11551161
}
11561162

1163+
EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION,
1164+
"Failed to send action get result to action " << action_name);
1165+
11571166
return false;
11581167
}
11591168

ddsenabler_test/compose/test_cases/services/service_client/compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ services:
3030
networks:
3131
std_net:
3232
default:
33-
driver: none
33+
driver: none

ddsenabler_test/compose/test_cases/services/service_server/compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ services:
5151
networks:
5252
std_net:
5353
default:
54-
driver: none
54+
driver: none

0 commit comments

Comments
 (0)