dexter has submitted this change. ( https://gerrit.osmocom.org/c/onomondo-eim/+/43088?usp=email )

(

6 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: rest_handler, cosmetic: clean up order of variable assignments ......................................................................

rest_handler, cosmetic: clean up order of variable assignments

We assign a couple of varibales before we output them to InfoList, let's make sure the order is consistent with the order in InfoList.

Related: SYS#8100 Change-Id: I2b998a619cf1db5532bcfe671d6d451d095c37f8 --- M src/rest_handler.erl 1 file changed, 4 insertions(+), 4 deletions(-)

Approvals: jolly: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified

diff --git a/src/rest_handler.erl b/src/rest_handler.erl index 9f5ab4d..6718986 100644 --- a/src/rest_handler.erl +++ b/src/rest_handler.erl @@ -162,23 +162,23 @@ % Output a list with basic information about the eIM instance to the requestor get_rest_info(Req, State) -> logger:info("REST: client requests info,~nPeer=~p~n", [maps:get(peer, Req)]), + {ok, Hostname} = inet:gethostname(), + {ok, Vsn} = application:get_key(onomondo_eim, vsn), {ok, EimId} = application:get_env(onomondo_eim, eim_id), {ok, EsipaIp} = application:get_env(onomondo_eim, esipa_ip), {ok, EsipaPort} = application:get_env(onomondo_eim, esipa_port), - {ok, Hostname} = inet:gethostname(), - {ok, Vsn} = application:get_key(onomondo_eim, vsn), {ok, EsipaSslCertPath} = utils:get_env_priv_file_path(onomondo_eim, esipa_ssl_cert), {ok, EsipaSslCertPem} = file:read_file(EsipaSslCertPath), {ok, EimCertPath} = utils:get_env_priv_file_path(onomondo_eim, eim_cert), {ok, EimCertPem} = file:read_file(EimCertPath), - {ok, CounterValue} = application:get_env(onomondo_eim, counter_value), - {ok, ConsumerEuicc} = application:get_env(onomondo_eim, consumer_euicc), FormatRootCiCert = fun(RootCiCert) -> {ok, RootCiCertPath} = utils:get_priv_file_path(onomondo_eim, RootCiCert), {ok, RootCiCertPem} = file:read_file(RootCiCertPath), RootCiCertPem end, {ok, RootCiCerts} = application:get_env(onomondo_eim, root_ci_certs), + {ok, CounterValue} = application:get_env(onomondo_eim, counter_value), + {ok, ConsumerEuicc} = application:get_env(onomondo_eim, consumer_euicc), RootCiCertsJson = [FormatRootCiCert(RootCiCert) || RootCiCert <- RootCiCerts],

InfoList =