221V 3 лет назад
Родитель
Сommit
18cc9c1fe1
2 измененных файлов с 1 добавлено и 22 удалено
  1. 0 21
      src/nitro_n2z.erl
  2. 1 1
      src/nitro_static.erl

+ 0 - 21
src/nitro_n2z.erl

@@ -78,8 +78,6 @@ html_events(#pickle{source=Source, pickled=Pickled, args=Linked}, State=#cx{toke
 
 % calling user code in exception-safe manner
 
--ifdef(OTP_RELEASE).
-
 render_ev(#ev{module=M, name=F, msg=P, trigger=T}, _Source, Linked, State) ->
   try
   case F of
@@ -116,25 +114,6 @@ io(Data) ->
     {io, [], {stack, S}}
   end.
 
--else.
-
-render_ev(#ev{module=M,name=F,msg=P,trigger=T},_Source,Linked,State) ->
-    try case F of
-         api_event -> M:F(P,Linked,State);
-             event -> [erlang:put(K,V) || {K,V} <- Linked], M:F(P);
-                 _ -> M:F(P,T,State) end
-    catch E:R -> S = erlang:get_stacktrace(), ?LOG_EXCEPTION(E, R, S), {stack, S} end.
-
-io(Event, #cx{module=Module}) ->
-    try X = Module:event(Event), {io,render_actions(erlang:get(actions)),X}
-    catch E:R -> S = erlang:get_stacktrace(), ?LOG_EXCEPTION(E, R, S), {io, <<>>, {stack, S}} end.
-
-io(Data) ->
-    try {io,render_actions(erlang:get(actions)),Data}
-    catch E:R -> S = erlang:get_stacktrace(), ?LOG_EXCEPTION(E, R, S), {io, <<>>, {stack, S}} end.
-
--endif.
-
 
 % event Nitrogen Web Framework protocol
 

+ 1 - 1
src/nitro_static.erl

@@ -65,7 +65,7 @@ get_file(Req, State={P, {ok, #file_info{'size'=_Size}}, _}) ->
   Raw = case file:read_file(FileName) of
     {ok, Bin} -> Bin;
     {error, _} ->
-      case mad_repl:load_file(StringPath) of
+      case mad_repl:load_file(StringPath) of % todo : no mad, look fs:mad_file/1
         {ok, ETSFile} -> ETSFile;
         {error, _} ->
           case file:read_file(filename:join([ code:lib_dir(erlang:list_to_atom(Name))|RestPath])) of