summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Feuer <mfeuer@jaguarlandrover.com>2015-06-07 16:27:49 -0700
committerMagnus Feuer <mfeuer@jaguarlandrover.com>2015-06-09 13:54:05 -0700
commit9c4a808dfbfe7fd4a73874cb317171bb4533191a (patch)
tree5ba5242976f87affabcfe074b2212002c92c4039
parenta13fd36530c1287ac4a3371cb44841de74333a25 (diff)
downloadrvi_core-9c4a808dfbfe7fd4a73874cb317171bb4533191a.tar.gz
Moved tizen.config to packaging Temporary workaround for setup issues in backend.config.
-rw-r--r--components/service_edge/src/service_edge_rpc.erl4
-rwxr-xr-xpackaging/rvi.spec2
-rw-r--r--packaging/tizen.config (renamed from tizen.config)18
3 files changed, 15 insertions, 9 deletions
diff --git a/components/service_edge/src/service_edge_rpc.erl b/components/service_edge/src/service_edge_rpc.erl
index c9294b1..916237f 100644
--- a/components/service_edge/src/service_edge_rpc.erl
+++ b/components/service_edge/src/service_edge_rpc.erl
@@ -528,11 +528,11 @@ dispatch_to_local_service([ $w, $s, $: | WSPidStr], message,
%% Dispatch to regular JSON-RPC over HTTP.
dispatch_to_local_service(URL, Command, Args) ->
- CmdStr = atom_to_list(Command),
- Res = rvi_common:send_json_request(URL, CmdStr, Args),
?debug("dispatch_to_local_service(): Command: ~p",[ CmdStr]),
?debug("dispatch_to_local_service(): Args: ~p",[ Args]),
?debug("dispatch_to_local_service(): URL: ~p",[ URL]),
+ CmdStr = atom_to_list(Command),
+ Res = rvi_common:send_json_request(URL, CmdStr, Args),
?debug("dispatch_to_local_service(): Result: ~p",[ Res]),
Res.
diff --git a/packaging/rvi.spec b/packaging/rvi.spec
index b61339a..659fff5 100755
--- a/packaging/rvi.spec
+++ b/packaging/rvi.spec
@@ -26,7 +26,7 @@ for i in $(find deps -name '*.app.src'); do sed 's/git/"1.0"/' < $i > $i.tmp; mv
make compile
# Create a tizen node if that is what we have.
-./scripts/setup_rvi_node.sh -n rvi-$RPM_PACKAGE_VERSION -c tizen.config
+./scripts/setup_rvi_node.sh -n rvi-$RPM_PACKAGE_VERSION -c ./packaging/tizen.config
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/opt/rvi-$RPM_PACKAGE_VERSION
diff --git a/tizen.config b/packaging/tizen.config
index 0749c54..6bdc2db 100644
--- a/tizen.config
+++ b/packaging/tizen.config
@@ -48,9 +48,9 @@
authorize,
schedule,
dlink_tcp,
- { bt, load },
- { dlink_bt, load },
- { proto_bert, load },
+ bt,
+ dlink_bt,
+ proto_bert,
proto_json
]},
@@ -172,7 +172,7 @@
%% value unless all services add a system-wide unique name
%% to it.
%%
- { node_service_prefix, "jlr.com/vin/$rvi_file(/home/app/content/Document/vin,no_vin)/"},
+ { node_service_prefix, "jlr.com/vin/$rvi_file(/home/app/content/Documents/vin,no_vin)/"},
%% Routing rules determining how to get a message targeting a specific
@@ -215,7 +215,7 @@
%% Which protocol and data link pair to use when transmitting the message
%% to the targeted service. If a pair reports a failure, the next pair is tried.
[
- { proto_json_rpc, { dlink_tcp_rpc, [ { target, "38.129.64.13:8807" } ]}}
+ { proto_json_rpc, { dlink_tcp_rpc, [ { target, "38.129.64.31:8807" } ]}}
]
}
]
@@ -322,7 +322,13 @@
{ server_opts, [ { port, 8817 }]},
%% Setup persistent connections
- { persistent_connections, [ "38.129.64.13:8807" ]}
+ { persistent_connections, [ "38.129.64.31:8807" ]}
+ ]
+ },
+ { dlink_bt_rpc, gen_server,
+ [
+ %% Bert_rpc server specifies the
+ { server_opts, [ { channel, 1 }]}
]
}
]