diff options
| author | Magnus Feuer <mfeuer@jaguarlandrover.com> | 2015-04-12 16:57:45 -0700 |
|---|---|---|
| committer | Magnus Feuer <mfeuer@jaguarlandrover.com> | 2015-04-12 16:57:45 -0700 |
| commit | 1dbfd0f5852261a2c73fec809a9e66de455f79fe (patch) | |
| tree | 7310933862a16750bf5f191d8fc957a3444754a0 /components/schedule | |
| parent | c3b0878925a047b37b81bbea74b6ebc171b31af4 (diff) | |
| download | rvi_core-1dbfd0f5852261a2c73fec809a9e66de455f79fe.tar.gz | |
Additional changes
Diffstat (limited to 'components/schedule')
| -rw-r--r-- | components/schedule/src/rvi_routing.erl | 20 | ||||
| -rw-r--r-- | components/schedule/src/schedule_rpc.erl | 10 |
2 files changed, 15 insertions, 15 deletions
diff --git a/components/schedule/src/rvi_routing.erl b/components/schedule/src/rvi_routing.erl index 3bbc16f..f870569 100644 --- a/components/schedule/src/rvi_routing.erl +++ b/components/schedule/src/rvi_routing.erl @@ -216,18 +216,18 @@ find_routes_(Routes, Service) -> %% { Protocol, { DataLink, DOpts } -> { {Protocol, [] }, {DataLink, DOpts } }, %% { { Protocol, POpts }, DataLink } -> { {Protocol, POpts}, {DataLink, [] }}, %% { { Protocol, POpts }, { DataLink, DOpts } -> { {Protocol, POpts}, {DataLink, DOpts }}, -normalize_routes_({ServicePrefix, []}, Acc) -> - { ServicePrefix, lists:reverse(Acc) }; +normalize_routes_([], Acc) -> + lists:reverse(Acc); -normalize_routes_({ServicePrefix, [ {{ Pr, PrOp }, { DL, DLOp }} | Rem ]}, Acc) -> - normalize_routes_({ServicePrefix, Rem}, [ {{Pr, PrOp}, { DL, DLOp } } | Acc]); +normalize_routes_([ {{ Pr, PrOp }, { DL, DLOp }} | Rem ], Acc) -> + normalize_routes_( Rem, [ {{Pr, PrOp}, { DL, DLOp } } | Acc]); -normalize_routes_({ServicePrefix, [ { Pr, { DL, DLOp }} | Rem ]}, Acc) -> - normalize_routes_({ServicePrefix, Rem}, [ { {Pr, []}, { DL, DLOp } } | Acc]); +normalize_routes_([ { Pr, { DL, DLOp }} | Rem ], Acc) -> + normalize_routes_(Rem, [ { {Pr, []}, { DL, DLOp } } | Acc]); -normalize_routes_({ServicePrefix, [ {{ Pr, PrOp}, DL } | Rem ]}, Acc) -> - normalize_routes_({ServicePrefix, Rem}, [ { {Pr, PrOp}, { DL, [] } } | Acc]); +normalize_routes_([ {{ Pr, PrOp}, DL } | Rem ], Acc) -> + normalize_routes_(Rem, [ { {Pr, PrOp}, { DL, [] } } | Acc]); -normalize_routes_({ServicePrefix, [ {Pr, DL} | Rem ]}, Acc) -> - normalize_routes_({ServicePrefix, Rem}, [ { {Pr, []}, { DL, [] } } | Acc]). +normalize_routes_([ {Pr, DL} | Rem ], Acc) -> + normalize_routes_(Rem, [ { {Pr, []}, { DL, [] } } | Acc]). diff --git a/components/schedule/src/schedule_rpc.erl b/components/schedule/src/schedule_rpc.erl index be05d92..a0c49df 100644 --- a/components/schedule/src/schedule_rpc.erl +++ b/components/schedule/src/schedule_rpc.erl @@ -448,7 +448,7 @@ queue_message(SvcName, %% to indicate that the service is available for the given DL. %% case DLMod:setup_data_link(NSt#st.cs, SvcName, DLOp) of - { ok, DLTimeout } -> + [ ok, DLTimeout ] -> %% Setup a timeout that triggers on whatever %% comes first of the message's general timeout @@ -472,11 +472,11 @@ queue_message(SvcName, }, %% Add to ets table - TransID = ets:insert(SvcRec#service.messages_tid, Msg), + ets:insert(SvcRec#service.messages_tid, Msg), {ok, NSt}; %% We failed with this route. Try the next one - { error, _Reason} -> + [ error, _Reason] -> queue_message(SvcName, TransID, Timeout, @@ -495,7 +495,7 @@ queue_message(SvcName, %% The service is not available try_sending_messages(#service { key = { SvcName, _ }, - available = false, + available = unavailable, messages_tid = _Tid } = _SvcRec, St) -> ?info("schedule:try_send(): SvcName: ~p: Not available", [SvcName]), @@ -503,7 +503,7 @@ try_sending_messages(#service { try_sending_messages(#service { key = { SvcName, DataLinkMod }, - available = true, + available = available, messages_tid = Tid } = SvcRec, St) -> ?debug("schedule:try_send(): Service: ~p:~p", [DataLinkMod, SvcName]), |