Merge branch 'shutdown' of git://github.com/lpgauth/bullet

ninenines · Jun 3, 2014 · 2d64d09 · 2d64d09
2 parents 8fd69aa + c2b8801
commit 2d64d09
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/bullet_handler.erl b/src/bullet_handler.erl
@@ -144,7 +144,9 @@ websocket_handle({text, Data}, Req,
 			{ok, Req2, State#state{handler_state=HandlerState2}, hibernate};
 		{reply, Reply, Req2, HandlerState2} ->
 			{reply, {text, Reply}, Req2,
-				State#state{handler_state=HandlerState2}, hibernate}
+				State#state{handler_state=HandlerState2}, hibernate};
+		{shutdown, Req2, HandlerState2} ->
+			{shutdown, Req2, State#state{handler_state=HandlerState2}}
 	end;
 websocket_handle(_Frame, Req, State) ->
 	{ok, Req, State, hibernate}.
@@ -156,7 +158,9 @@ websocket_info(Info, Req, State=#state{
 			{ok, Req2, State#state{handler_state=HandlerState2}, hibernate};
 		{reply, Reply, Req2, HandlerState2} ->
 			{reply, {text, Reply}, Req2,
-				State#state{handler_state=HandlerState2}, hibernate}
+				State#state{handler_state=HandlerState2}, hibernate};
+		{shutdown, Req2, HandlerState2} ->
+			{shutdown, Req2, State#state{handler_state=HandlerState2}}
 	end.
 
 websocket_terminate(_Reason, Req,