|
@@ -25,19 +25,19 @@ info(#init{token=Auth}, Req, State) ->
|
|
Req,New};
|
|
Req,New};
|
|
|
|
|
|
info(#client{data=Message}, Req, State) ->
|
|
info(#client{data=Message}, Req, State) ->
|
|
- nitro:actions([]),
|
|
|
|
|
|
+ erlang:put(actions, []),
|
|
{reply, {bert, io(#client{data=Message}, State)}, Req, State};
|
|
{reply, {bert, io(#client{data=Message}, State)}, Req, State};
|
|
|
|
|
|
info(#pickle{}=Event, Req, State) ->
|
|
info(#pickle{}=Event, Req, State) ->
|
|
- nitro:actions([]),
|
|
|
|
|
|
+ erlang:put(actions, []),
|
|
{reply, {bert, html_events(Event, State)}, Req, State};
|
|
{reply, {bert, html_events(Event, State)}, Req, State};
|
|
|
|
|
|
info(#flush{data=Actions}, Req, State) ->
|
|
info(#flush{data=Actions}, Req, State) ->
|
|
- nitro:actions(Actions),
|
|
|
|
|
|
+ erlang:put(actions, Actions),
|
|
{reply, {bert, io(<<>>)}, Req, State};
|
|
{reply, {bert, io(<<>>)}, Req, State};
|
|
|
|
|
|
info(#direct{data=Message}, Req, State) ->
|
|
info(#direct{data=Message}, Req, State) ->
|
|
- nitro:actions([]),
|
|
|
|
|
|
+ erlang:put(actions, []),
|
|
{reply, {bert, case io(Message, State) of
|
|
{reply, {bert, case io(Message, State) of
|
|
{io, _, {stack, _}} = Io -> Io;
|
|
{io, _, {stack, _}} = Io -> Io;
|
|
{io, Code, Res} -> {io, Code, {direct, Res}} end},
|
|
{io, Code, Res} -> {io, Code, {direct, Res}} end},
|
|
@@ -49,10 +49,10 @@ info(Message, Req, State) -> {unknown, Message, Req, State}.
|
|
% double render: actions could generate actions
|
|
% double render: actions could generate actions
|
|
|
|
|
|
render_actions(Actions) ->
|
|
render_actions(Actions) ->
|
|
- nitro:actions([]),
|
|
|
|
|
|
+ erlang:put(actions, []),
|
|
First = nitro:render(Actions),
|
|
First = nitro:render(Actions),
|
|
- Second = nitro:render(nitro:actions()),
|
|
|
|
- nitro:actions([]),
|
|
|
|
|
|
+ Second = nitro:render(erlang:get(actions)),
|
|
|
|
+ erlang:put(actions, []),
|
|
nitro:to_binary([First, Second]).
|
|
nitro:to_binary([First, Second]).
|
|
|
|
|
|
|
|
|
|
@@ -99,7 +99,7 @@ render_ev(#ev{module=M, name=F, msg=P, trigger=T}, _Source, Linked, State) ->
|
|
io(Event, #cx{module=Module}) ->
|
|
io(Event, #cx{module=Module}) ->
|
|
try
|
|
try
|
|
X = Module:event(Event),
|
|
X = Module:event(Event),
|
|
- {io, render_actions(nitro:actions()), X}
|
|
|
|
|
|
+ {io, render_actions(erlang:get(actions)), X}
|
|
|
|
|
|
catch E:R:S ->
|
|
catch E:R:S ->
|
|
?LOG_EXCEPTION(E, R, S),
|
|
?LOG_EXCEPTION(E, R, S),
|
|
@@ -108,7 +108,7 @@ io(Event, #cx{module=Module}) ->
|
|
|
|
|
|
io(Data) ->
|
|
io(Data) ->
|
|
try
|
|
try
|
|
- {io, render_actions(nitro:actions()), Data}
|
|
|
|
|
|
+ {io, render_actions(erlang:get(actions)), Data}
|
|
|
|
|
|
catch E:R:S ->
|
|
catch E:R:S ->
|
|
?LOG_EXCEPTION(E, R, S),
|
|
?LOG_EXCEPTION(E, R, S),
|
|
@@ -122,15 +122,15 @@ render_ev(#ev{module=M,name=F,msg=P,trigger=T},_Source,Linked,State) ->
|
|
api_event -> M:F(P,Linked,State);
|
|
api_event -> M:F(P,Linked,State);
|
|
event -> [erlang:put(K,V) || {K,V} <- Linked], M:F(P);
|
|
event -> [erlang:put(K,V) || {K,V} <- Linked], M:F(P);
|
|
_ -> M:F(P,T,State) end
|
|
_ -> M:F(P,T,State) end
|
|
- catch E:R -> S = erlang:get_stacktrace(), ?LOG_EXCEPTION(E,R,S), {stack,S} end.
|
|
|
|
|
|
+ catch E:R -> S = erlang:get_stacktrace(), ?LOG_EXCEPTION(E, R, S), {stack, S} end.
|
|
|
|
|
|
io(Event, #cx{module=Module}) ->
|
|
io(Event, #cx{module=Module}) ->
|
|
- try X = Module:event(Event), {io,render_actions(nitro:actions()),X}
|
|
|
|
- catch E:R -> S = erlang:get_stacktrace(), ?LOG_EXCEPTION(E,R,S), {io,<<>>,{stack,S}} end.
|
|
|
|
|
|
+ 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) ->
|
|
io(Data) ->
|
|
- try {io,render_actions(nitro:actions()),Data}
|
|
|
|
- catch E:R -> S = erlang:get_stacktrace(), ?LOG_EXCEPTION(E,R,S), {io,<<>>,{stack,S}} end.
|
|
|
|
|
|
+ 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.
|
|
-endif.
|
|
|
|
|