summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus <mfeuer@jaguarlandrover.com>2014-08-04 16:45:03 -0700
committerMagnus <mfeuer@jaguarlandrover.com>2014-08-04 16:45:03 -0700
commit7117db4ec0a0cfd2f099f1419c947b6931671d85 (patch)
treeb998c625ceab1557ddc365673655f21590092ec7
parentaebbb09b61634c47a1c7006c9720ce2c75877748 (diff)
downloadrvi_core-7117db4ec0a0cfd2f099f1419c947b6931671d85.tar.gz
Temporary commit
Signed-off-by: Magnus <mfeuer@jaguarlandrover.com>
-rw-r--r--src/service_edge_rpc.erl19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/service_edge_rpc.erl b/src/service_edge_rpc.erl
index ff5c453..e745500 100644
--- a/src/service_edge_rpc.erl
+++ b/src/service_edge_rpc.erl
@@ -32,7 +32,7 @@ register_service(Service, Address) ->
?debug("service_edge_rpc:register_service(): address: ~p ", [Address]),
case
- rvi_common:send_component_request(service_discovery, register_service,
+ rvi_common:send_component_request(service_discovery, register_local_service,
[
{service, Service},
{network_address, Address}
@@ -91,19 +91,24 @@ handle_local_message(Target, Timeout, Parameters, CallingService) ->
{ ok, [ { status, rvi_common:json_rpc_status(ok)} ] };
Err ->
- ?debug("service_edge_rpc:register_service() Failed at scheduling: ~p",
+ ?debug("service_edge_rpc:handle_local_message() Failed at scheduling: ~p",
[ Err ]),
- Err
+ { ok, [ { status, rvi_common:json_rpc_status(internal)} ] }
end;
+ {ok, not_found, _, _} ->
+ ?debug("service_edge_rpc:handle_local_message() Service ~p not found",
+ [ Target ]),
+ { ok, [ { status, rvi_common:json_rpc_status(not_found)} ] };
+
Err ->
- ?debug("service_edge_rpc:register_service() Failed at service discovery: ~p",
+ ?debug("service_edge_rpc:handle_local_message() Failed at service discovery: ~p",
[ Err ]),
- Err
+ { ok, [ { status, rvi_common:json_rpc_status(internal)} ] }
end;
Err ->
- ?debug("service_edge_rpc:register_service() Failed at authorize: ~p",
+ ?debug("service_edge_rpc:handle_local_message() Failed at authorize: ~p",
[ Err ]),
Err
end.
@@ -147,7 +152,7 @@ handle_remote_message(Target, Timeout, Parameters, Signature, Certificate) ->
{ ok, [ { status, rvi_common:json_rpc_status(ok)} ] };
%% Request delivered (with no status reply)
- {ok, undefined } ->
+ {ok, undefined } ->
{ ok, [ { status, rvi_common:json_rpc_status(ok)} ] };
%% status returned was an error code.