fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41612?usp=email )
Change subject: osmo_s1gw: add set_log_prefix/1 ......................................................................
osmo_s1gw: add set_log_prefix/1
Let's have a common API that can be used by all other modules.
Change-Id: I77ee96f195067ef0137f2cb8af5d455b24ccdd54 --- M src/erab_fsm.erl M src/osmo_s1gw.erl M src/s1ap_proxy.erl 3 files changed, 9 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/12/41612/1
diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index 1871919..f281e4b 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -610,7 +610,7 @@ %% set process metadata for the logger set_logging_prefix(UID) -> Prefix = io_lib:format("E-RAB ~p", [UID]), - logger:set_process_metadata(#{prefix => Prefix}). + osmo_s1gw:set_log_prefix(Prefix).
-spec session_establish_req(erab_state()) -> pfcp_peer:pfcp_session_rsp(). diff --git a/src/osmo_s1gw.erl b/src/osmo_s1gw.erl index 4444fe0..144301a 100644 --- a/src/osmo_s1gw.erl +++ b/src/osmo_s1gw.erl @@ -37,6 +37,7 @@ -export([get_env/2, set_env/2, get_priv/1, + set_log_prefix/1, main/1]).
-define(ENV_APP_NAME, osmo_s1gw). @@ -69,6 +70,12 @@ filename:join(PrivDir, Name).
+%% Set logging prefix for the calling process +-spec set_log_prefix(string()) -> ok. +set_log_prefix(Prefix) when is_list(Prefix) -> + logger:set_process_metadata(#{prefix => Prefix}). + + main(_Args) -> application:ensure_all_started(?MODULE), timer:sleep(infinity). diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 502480e..a241611 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -200,11 +200,6 @@ %% private API %% ------------------------------------------------------------------
--spec set_logging_prefix(string()) -> ok. -set_logging_prefix(Prefix) when is_list(Prefix) -> - logger:set_process_metadata(#{prefix => Prefix}). - - -spec erab_uid(erab_id(), proxy_state()) -> erab_uid(). erab_uid(ERABId, #proxy_state{mme_ue_id = MmeUeId}) -> {MmeUeId, ERABId}. @@ -733,7 +728,7 @@ S1#proxy_state.enb_id]), %% use that as a context for logging GlobalENBId = genb_id_str(S1), - set_logging_prefix("eNB " ++ GlobalENBId), + osmo_s1gw:set_log_prefix("eNB " ++ GlobalENBId), %% register per-eNB metrics ctr_reg_all(GlobalENBId), %% increment per-eNB ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, if needed
-
fixeria