diff options
| author | Magnus Feuer <mfeuer@jaguarlandrover.com> | 2015-03-23 19:42:23 -0700 |
|---|---|---|
| committer | Magnus Feuer <mfeuer@jaguarlandrover.com> | 2015-03-23 19:42:23 -0700 |
| commit | c766984479e4dcd1db585cb6d0d84b7d14422f50 (patch) | |
| tree | 5d57332c14449dd661e07909e2ac9614ee39f149 /components/schedule | |
| parent | 6f990c48e377ed8a1a7bfb94f7c9bde80bfd4f2f (diff) | |
| download | rvi_core-c766984479e4dcd1db585cb6d0d84b7d14422f50.tar.gz | |
More proplist conversion
Diffstat (limited to 'components/schedule')
| -rw-r--r-- | components/schedule/src/schedule_rpc.erl | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/components/schedule/src/schedule_rpc.erl b/components/schedule/src/schedule_rpc.erl index aeb11ef..55d1b9e 100644 --- a/components/schedule/src/schedule_rpc.erl +++ b/components/schedule/src/schedule_rpc.erl @@ -122,32 +122,26 @@ schedule_message(CompSpec, rvi_common:request(schedule, ?MODULE, schedule_message, - [SvcName, - Timeout, - Parameters, - Signature, - Certificate], - [service_name, - timeout, - parameters, - signature, - certificate], + [{ service, SvcName }, + { timeout, Timeout }, + { parameters, Parameters }, + { signature, Signature }, + { certificate, Certificate }], [status, transaction_id], CompSpec). register_remote_services(CompSpec, NetworkAddress, Services) -> rvi_common:request(schedule, ?MODULE, register_remote_services, - [NetworkAddress, Services], - [network_address, services], + [{ network_address, NetworkAddress} , + { services, Services }], [status, transaction_id], CompSpec). unregister_remote_services(CompSpec, ServiceNames) -> rvi_common:request(schedule, ?MODULE, unregister_remote_services, - [ServiceNames], - [services], + [{ services, ServiceNames }], [status], CompSpec). @@ -155,17 +149,17 @@ unregister_remote_services(CompSpec, ServiceNames) -> %% JSON-RPC entry point %% CAlled by local exo http server handle_rpc("schedule_message", Args) -> - {ok, SvcName} = rvi_common:get_json_element(["service_name"], Args), + {ok, SvcName} = rvi_common:get_json_element(["service"], Args), {ok, Timeout} = rvi_common:get_json_element(["timeout"], Args), {ok, Parameters} = rvi_common:get_json_element(["parameters"], Args), {ok, Signature} = rvi_common:get_json_element(["signature"], Args), {ok, Certificate} = rvi_common:get_json_element(["certificate"], Args), - ?debug("schedule_rpc:schedule_request(): service_name: ~p", [ SvcName]), - ?debug("schedule_rpc:schedule_request(): timeout: ~p", [ Timeout]), + ?debug("schedule_rpc:schedule_request(): service: ~p", [ SvcName]), + ?debug("schedule_rpc:schedule_request(): timeout: ~p", [ Timeout]), %% ?debug("schedule_rpc:schedule_request(): parameters: ~p", [Parameters]), - ?debug("schedule_rpc:schedule_request(): signature: ~p", [Signature]), - ?debug("schedule_rpc:schedule_request(): certificate: ~p", [Certificate]), + ?debug("schedule_rpc:schedule_request(): signature: ~p", [Signature]), + ?debug("schedule_rpc:schedule_request(): certificate: ~p", [Certificate]), [ok, TransID] = gen_server:call(?SERVER, { rvi_call, schedule_message, [ SvcName, @@ -211,12 +205,12 @@ handle_call( { rvi_call, schedule_message, Signature, Certificate] }, _From, St) -> - ?debug("schedule:sched_msg(): service_name: ~p", [SvcName]), - ?debug("schedule:sched_msg(): timeout: ~p", [Timeout]), - ?debug("schedule:sched_msg(): parameters: ~p", [Parameters]), - ?debug("schedule:sched_msg(): signature: ~p", [Signature]), - ?debug("schedule:sched_msg(): certificate: ~p", [Certificate]), - ?debug("schedule:sched_msg(): St: ~p", [St]), + ?debug("schedule:sched_msg(): service: ~p", [SvcName]), + ?debug("schedule:sched_msg(): timeout: ~p", [Timeout]), + ?debug("schedule:sched_msg(): parameters: ~p", [Parameters]), + ?debug("schedule:sched_msg(): signature: ~p", [Signature]), + ?debug("schedule:sched_msg(): certificate ~p", [Certificate]), + ?debug("schedule:sched_msg(): St: ~p", [St]), { ok, TransID, NSt } = queue_message(SvcName, |