Commit ff405e3c authored by Wandenberg's avatar Wandenberg

changed push_stream_store_messages directive to make possible set it inside an if block

parent 93fe74e2
h1(#changelog). Changelog h1(#changelog). Changelog
* Changed push_stream_store_messages directive to make possible set it inside an if block
* Renamed broadcast feature to wildcard, more adequate with the way it works * Renamed broadcast feature to wildcard, more adequate with the way it works
** push_stream_broadcast_channel_prefix -> push_stream_wildcard_channel_prefix ** push_stream_broadcast_channel_prefix -> push_stream_wildcard_channel_prefix
** push_stream_broadcast_channel_max_qtd -> push_stream_wildcard_channel_max_qtd ** push_stream_broadcast_channel_max_qtd -> push_stream_wildcard_channel_max_qtd
......
...@@ -423,6 +423,52 @@ describe "Publisher Properties" do ...@@ -423,6 +423,52 @@ describe "Publisher Properties" do
end end
end end
it "should accept store messages inside an if block" do
merged_config = config.merge({
:header_template => nil,
:footer_template => nil,
:subscriber_connection_ttl => '1s',
:extra_location => %{
location /pub2 {
push_stream_publisher #{config[:publisher_mode]};
push_stream_channel_id $arg_id;
push_stream_store_messages off;
if ($arg_test) {
push_stream_store_messages on;
}
}
}
})
channel = 'store_messages_inside_if_block'
body = 'published message'
resp_1 = ""
resp_2 = ""
nginx_run_server(merged_config) do |conf|
EventMachine.run do
pub_1 = EventMachine::HttpRequest.new(nginx_address + '/pub2?id=' + channel.to_s).post :head => headers, :body => body
pub_1.callback do
pub_1.should be_http_status(200)
response = JSON.parse(pub_1.response)
response["published_messages"].to_i.should eql(1)
response["stored_messages"].to_i.should eql(0)
pub_2 = EventMachine::HttpRequest.new(nginx_address + '/pub2?id=' + channel.to_s + '&test=1').post :head => headers, :body => body
pub_2.callback do
pub_2.should be_http_status(200)
response = JSON.parse(pub_2.response)
response["published_messages"].to_i.should eql(2)
response["stored_messages"].to_i.should eql(1)
EventMachine.stop
end
end
end
end
end
context "when allow origin directive is set" do context "when allow origin directive is set" do
it "should receive acess control allow headers" do it "should receive acess control allow headers" do
channel = 'test_access_control_allow_headers' channel = 'test_access_control_allow_headers'
......
...@@ -129,7 +129,7 @@ static ngx_command_t ngx_http_push_stream_commands[] = { ...@@ -129,7 +129,7 @@ static ngx_command_t ngx_http_push_stream_commands[] = {
offsetof(ngx_http_push_stream_loc_conf_t, channels_path), offsetof(ngx_http_push_stream_loc_conf_t, channels_path),
NULL }, NULL },
{ ngx_string("push_stream_store_messages"), { ngx_string("push_stream_store_messages"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
ngx_conf_set_flag_slot, ngx_conf_set_flag_slot,
NGX_HTTP_LOC_CONF_OFFSET, NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_push_stream_loc_conf_t, store_messages), offsetof(ngx_http_push_stream_loc_conf_t, store_messages),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment