Don't corrupt state of channel when receiving pubsub message

japerk · May 6, 2010 · 6ea326a · 6ea326a
1 parent b061b63
commit 6ea326a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/erldis_client.erl b/src/erldis_client.erl
@@ -463,7 +463,8 @@ parse_state(State, Socket, Data) ->
 			        Pid ! {message, Class, PubSubValue};
 			      _ ->
 			        error_logger:error_report([lost_message, {class, Class}])
-			    end;
+			    end,
+			    send_reply(State#redis{buffer=[]});
 			  Buffer -> 
 			    send_reply(State#redis{buffer=Buffer})
 			end;

diff --git a/test/erldis_pubsub_tests.erl b/test/erldis_pubsub_tests.erl
@@ -35,4 +35,25 @@ pubsub_test()->
   after
     100 ->
       ?assertEqual(true, false) %TODO not proud
+  end.
+
+pubsub_multiple_test()->
+  {ok, Pub} = erldis:connect("localhost", 6379),
+  {ok, Sub} = erldis:connect("localhost", 6379),
+  ?assertEqual(1, erldis:subscribe(Sub, <<"multibidule">>, self())),
+  ?assertEqual(1, erldis:publish(Pub, <<"multibidule">>, <<"bar">>)),
+  receive
+    {message, <<"multibidule">>, M1} ->
+      ?assertEqual(<<"bar">>, M1)
+  after
+    100 ->
+      ?assertEqual(true, false) %TODO not proud
+  end,
+  ?assertEqual(1, erldis:publish(Pub, <<"multibidule">>, <<"baz">>)),
+  receive
+    {message, <<"multibidule">>, M2} ->
+      ?assertEqual(<<"baz">>, M2)
+  after
+    100 ->
+      ?assertEqual(true, false) %TODO not proud
   end.