diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_policy.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_runtime_parameters.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_vhost_limit.erl | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_policy.erl b/src/rabbit_policy.erl index 4ab972872e..cf65665874 100644 --- a/src/rabbit_policy.erl +++ b/src/rabbit_policy.erl @@ -215,7 +215,7 @@ parse_set(Type, VHost, Name, Pattern, Definition, Priority, ApplyTo, ActingUser) end. parse_set0(Type, VHost, Name, Pattern, Defn, Priority, ApplyTo, ActingUser) -> - case rabbit_json:try_decode(Defn) of + case rabbit_json:try_decode(Defn, [return_maps]) of {ok, Term} -> set0(Type, VHost, Name, [{<<"pattern">>, Pattern}, diff --git a/src/rabbit_runtime_parameters.erl b/src/rabbit_runtime_parameters.erl index 7a320e108b..b29cddcc45 100644 --- a/src/rabbit_runtime_parameters.erl +++ b/src/rabbit_runtime_parameters.erl @@ -105,7 +105,7 @@ parse_set(_, <<"policy">>, _, _, _) -> {error_string, "policies may not be set using this method"}; parse_set(VHost, Component, Name, String, User) -> Definition = rabbit_data_coercion:to_binary(String), - case rabbit_json:try_decode(Definition) of + case rabbit_json:try_decode(Definition, [return_maps]) of {ok, Term} when is_map(Term) -> set(VHost, Component, Name, maps:to_list(Term), User); {ok, Term} -> set(VHost, Component, Name, Term, User); error -> {error_string, "JSON decoding error"} @@ -118,7 +118,7 @@ set(VHost, Component, Name, Term, User) -> parse_set_global(Name, String, ActingUser) -> Definition = rabbit_data_coercion:to_binary(String), - case rabbit_json:try_decode(Definition) of + case rabbit_json:try_decode(Definition, [return_maps]) of {ok, Term} when is_map(Term) -> set_global(Name, maps:to_list(Term), ActingUser); {ok, Term} -> set_global(Name, Term, ActingUser); error -> {error_string, "JSON decoding error"} diff --git a/src/rabbit_vhost_limit.erl b/src/rabbit_vhost_limit.erl index b948a94668..11446d3f20 100644 --- a/src/rabbit_vhost_limit.erl +++ b/src/rabbit_vhost_limit.erl @@ -134,7 +134,7 @@ is_over_queue_limit(VirtualHost) -> parse_set(VHost, Defn, ActingUser) -> Definition = rabbit_data_coercion:to_binary(Defn), - case rabbit_json:try_decode(Definition) of + case rabbit_json:try_decode(Definition, [return_maps]) of {ok, Term} -> set(VHost, maps:to_list(Term), ActingUser); error -> |