diff options
| author | Diana Corbacho <diana.corbacho@erlang-solutions.com> | 2016-01-08 18:53:34 +0100 |
|---|---|---|
| committer | Diana Corbacho <diana.corbacho@erlang-solutions.com> | 2016-01-08 18:53:34 +0100 |
| commit | 33ce3f8d9caf9ac7d5048ac323526a7f1772e9b6 (patch) | |
| tree | 8edfc05c683e2f7ac5de1448fc6ab305691e56ba /src | |
| parent | 203ac917ab6736d1d09b4c7a14121b309529e947 (diff) | |
| download | rabbitmq-server-git-33ce3f8d9caf9ac7d5048ac323526a7f1772e9b6.tar.gz | |
Rename runtime parameter to exchange-delete-in-progress
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_exchange.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_exchange_parameters.erl | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 842aff9b19..fe1fa1a19e 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -167,7 +167,7 @@ declare(XName, Type, Durable, AutoDelete, Internal, Args) -> %% We want to upset things if it isn't ok ok = XT:validate(X), case rabbit_runtime_parameters:lookup(XName#resource.virtual_host, - <<"exchange-delete">>, + <<"exchange-delete-in-progress">>, XName#resource.name) of not_found -> rabbit_misc:execute_mnesia_transaction( @@ -436,7 +436,7 @@ delete(XName, IfUnused) -> false -> fun unconditional_delete/2 end, rabbit_runtime_parameters:set(XName#resource.virtual_host, - <<"exchange-delete">>, + <<"exchange-delete-in-progress">>, XName#resource.name, true, none), call_with_exchange( XName, @@ -451,7 +451,7 @@ delete(XName, IfUnused) -> end end), rabbit_runtime_parameters:clear(XName#resource.virtual_host, - <<"exchange-delete">>, + <<"exchange-delete-in-progress">>, XName#resource.name). validate_binding(X = #exchange{type = XType}, Binding) -> diff --git a/src/rabbit_exchange_parameters.erl b/src/rabbit_exchange_parameters.erl index 793c06007a..4fa7a283a6 100644 --- a/src/rabbit_exchange_parameters.erl +++ b/src/rabbit_exchange_parameters.erl @@ -28,13 +28,14 @@ {enables, recovery}]}). register() -> - rabbit_registry:register(runtime_parameter, <<"exchange-delete">>, ?MODULE). + rabbit_registry:register(runtime_parameter, + <<"exchange-delete-in-progress">>, ?MODULE). -validate(_VHost, <<"exchange-delete">>, _Name, _Term, _User) -> +validate(_VHost, <<"exchange-delete-in-progress">>, _Name, _Term, _User) -> ok. -notify(_VHost, <<"exchange-delete">>, _Name, _Term) -> +notify(_VHost, <<"exchange-delete-in-progress">>, _Name, _Term) -> ok. -notify_clear(_VHost, <<"exchange-delete">>, _Name) -> +notify_clear(_VHost, <<"exchange-delete-in-progress">>, _Name) -> ok. |