Просмотр исходного кода

n2o to n4u - application:get_env

221V 3 лет назад
Родитель
Сommit
68be03fc96
4 измененных файлов с 8 добавлено и 8 удалено
  1. 1 1
      src/endpoints/n2o_proto.erl
  2. 1 1
      src/formatters/wf_convert.erl
  3. 3 3
      src/n4u_sup.erl
  4. 3 3
      src/wf.erl

+ 1 - 1
src/endpoints/n2o_proto.erl

@@ -32,7 +32,7 @@ stream({binary,<<>>},R,S) -> nop(R,S);
 stream({binary,D},R,S)    -> filter(upack(D),R,S,protocols(),[]);
 stream(_,R,S)             -> nop(R,S).
 
-filter(M,R,S,Protos,Acc)  -> case application:get_env(n2o,filter,{?MODULE,push}) of
+filter(M,R,S,Protos,Acc)  -> case application:get_env(n4u, filter, {?MODULE, push}) of
                                   undefined -> push(M,R,S,Protos,Acc);
                                   {Mod,Fun} -> Mod:Fun(M,R,S,Protos,Acc) end.
 

+ 1 - 1
src/formatters/wf_convert.erl

@@ -7,7 +7,7 @@
 -define(IS_STRING(Term), (is_list(Term) andalso Term /= [] andalso is_integer(hd(Term)))).
 
 -ifndef(N2O_JSON).
--define(N2O_JSON, (application:get_env(n2o,json,jsone))).
+-define(N2O_JSON, (application:get_env(n4u, json, jsone))).
 -endif.
 
 

+ 3 - 3
src/n4u_sup.erl

@@ -20,7 +20,7 @@ start_link() ->
 init([]) ->
   [ ets:new(T, ets_tables_opts()) || T <- ets_tables() ],
   
-  case application:get_env(n2o, mq, "") of
+  case application:get_env(n4u, mq, "") of
     n2o_syn -> syn:init();
     _ -> ok
   end,
@@ -36,7 +36,7 @@ timer_restart(Diff) ->
   erlang:send_after(1000 * (Z + 60 * Y + 60 * 60 * X), erlang:self(), {timer, ping}).
 
 
-ping() -> application:get_env(n2o, timer, {0, 10, 0}).
+ping() -> application:get_env(n4u, timer, {0, 10, 0}).
 
 
 proc(init, #handler{}=Async) ->
@@ -50,6 +50,6 @@ proc({timer, ping}, #handler{state=Timer}=Async) ->
     _ -> erlang:cancel_timer(Timer)
   end,
   wf:info(?MODULE, "n4u Timer: ~p~n", [ping]),
-  (application:get_env(n2o, session, n2o_session)):invalidate_sessions(),
+  (application:get_env(n4u, session, n2o_session)):invalidate_sessions(),
   wf:invalidate_cache(),
   {reply, ok, Async#handler{state=timer_restart(ping())}}.

+ 3 - 3
src/wf.erl

@@ -264,11 +264,11 @@ add_action(Action)       -> n2o_cx:add_action(Action).
 fold(Fun,Handlers,Ctx) -> n2o_cx:fold(Fun,Handlers,Ctx).
 
 config_multiple(Keys) -> [config(Key, "") || Key <- Keys].
-config(Key) -> config(n2o, Key, "").
-config(App, Key) -> config(App,Key, "").
+config(Key) -> config(n4u, Key, "").
+config(App, Key) -> config(App, Key, "").
 config(App, Key, Default) -> wf_utils:config(App, Key, Default).
 
-version() -> proplists:get_value(vsn,element(2,application:get_all_key(n2o))).
+version() -> proplists:get_value(vsn, element(2, application:get_all_key(n4u))).
 
 setkey(Name,Pos,List,New) ->
     case lists:keyfind(Name,Pos,List) of