diff --git a/core/kazoo_apps/src/kapps_config.erl b/core/kazoo_apps/src/kapps_config.erl index f035f9090ad..a3496b3c5b0 100644 --- a/core/kazoo_apps/src/kapps_config.erl +++ b/core/kazoo_apps/src/kapps_config.erl @@ -430,7 +430,7 @@ get_node_value(Category, Key, Default) -> -spec get_node_value(config_category(), config_key(), Default, config_node()) -> any() | Default. get_node_value(Category, Key, Default, Node) when not is_list(Key) -> - get_node_value(Category, [kz_term:to_binary(Key)], Default, Node); + get_node_value(Category, key(Key), Default, Node); get_node_value(Category, Keys, Default, Node) when not is_binary(Category) -> get_node_value(kz_term:to_binary(Category), Keys, Default, Node); get_node_value(Category, Keys, Default, Node) when not is_binary(Node) -> @@ -463,7 +463,7 @@ get(Category, Key, Default) -> get(Category, Key, Default, 'undefined') -> get(Category, Key, Default, ?KEY_DEFAULT); get(Category, Key, Default, Node) when not is_list(Key) -> - get(Category, [kz_term:to_binary(Key)], Default, Node); + get(Category, key(Key), Default, Node); get(Category, Keys, Default, Node) when not is_binary(Category) -> get(kz_term:to_binary(Category), Keys, Default, Node); get(Category, Keys, Default, Node) when not is_binary(Node) -> @@ -492,7 +492,7 @@ get_current(Category, Key, Default) -> get_current(Category, Key, Default, 'undefined') -> get_current(Category, Key, Default, ?KEY_DEFAULT); get_current(Category, Key, Default, Node) when not is_list(Key) -> - get_current(Category, [kz_term:to_binary(Key)], Default, Node); + get_current(Category, key(Key), Default, Node); get_current(Category, Keys, Default, Node) when not is_binary(Category) -> get_current(kz_term:to_binary(Category), Keys, Default, Node); get_current(Category, Keys, Default, Node) when not is_binary(Node) -> @@ -648,7 +648,7 @@ update_category(_, _, 'undefined', _, _) -> 'ok'; update_category(Category, Key, Value, 'undefined', Options) -> update_category(Category, Key, Value, ?KEY_DEFAULT, Options); update_category(Category, Key, Value, Node, Options) when not is_list(Key) -> - update_category(Category, [kz_term:to_binary(Key)], Value, Node, Options); + update_category(Category, key(Key), Value, Node, Options); update_category(Category, Key, Value, Node, Options) when not is_binary(Category) -> update_category(kz_term:to_binary(Category), Key, Value, Node, Options); update_category(Category, Key, Value, Node, Options) when not is_binary(Node) -> @@ -1379,7 +1379,7 @@ fetch_current(Category, Key, Default) -> fetch_current(Category, Key, Default, 'undefined') -> fetch_current(Category, Key, Default, ?KEY_DEFAULT); fetch_current(Category, Key, Default, Node) when not is_list(Key) -> - fetch_current(Category, [kz_term:to_binary(Key)], Default, Node); + fetch_current(Category, key(Key), Default, Node); fetch_current(Category, Keys, Default, Node) when not is_binary(Category) -> fetch_current(kz_term:to_binary(Category), Keys, Default, Node); fetch_current(Category, Keys, Default, Node) when not is_binary(Node) -> @@ -1415,3 +1415,10 @@ fetch_default_value([?KEY_DEFAULT | _Keys]=Path, Default, JObj) -> end; fetch_default_value(Keys, Default, JObj) -> fetch_default_value([?KEY_DEFAULT | Keys], Default, JObj). + +-spec key(term()) -> [binary()]. +key(Key) -> + case erlang:get('is_sup_call') of + true -> binary:split(kz_term:to_binary(Key), <<".">>, [global]); + _ -> [kz_term:to_binary(Key)] + end. diff --git a/core/sup/src/sup.erl b/core/sup/src/sup.erl index e57c9f995ff..f602f9ef1e4 100644 --- a/core/sup/src/sup.erl +++ b/core/sup/src/sup.erl @@ -94,6 +94,7 @@ main(CommandLineArgs, Loops) -> -spec in_kazoo(atom(), module(), atom(), kz_term:binaries()) -> no_return(). in_kazoo(SUPName, M, F, As) -> kz_util:put_callid(SUPName), + erlang:put('is_sup_call', true), lager:notice("~s: ~s ~s ~s", [?MODULE, M, F, kz_util:iolist_join($,, As)]), R = apply(M, F, As), lager:notice("~s result: ~p", [?MODULE, R]),