diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-02-01 17:45:07 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-02-01 17:45:07 +0300 |
| commit | 288ab084198212282d419eb78ccfd91c1c4108b6 (patch) | |
| tree | 1bac448d2d816f297b0d4a6e2c2692b6bfb69ce3 | |
| parent | f4f8c58e72f39c2181e8293bff8f9d995a88b1a3 (diff) | |
| download | rabbitmq-server-git-288ab084198212282d419eb78ccfd91c1c4108b6.tar.gz | |
Switch to rabbit_json:try_decode/1
| -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 3d8851369e..c4fbf1c830 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, [return_maps]) of + case rabbit_json:try_decode(Defn) of {ok, Term} -> set0(Type, VHost, Name, [{<<"pattern">>, Pattern}, diff --git a/src/rabbit_runtime_parameters.erl b/src/rabbit_runtime_parameters.erl index 4a3be9ffae..64442142da 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, [return_maps]) of + case rabbit_json:try_decode(Definition) 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, Reason} -> @@ -120,7 +120,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, [return_maps]) of + case rabbit_json:try_decode(Definition) of {ok, Term} when is_map(Term) -> set_global(Name, maps:to_list(Term), ActingUser); {ok, Term} -> set_global(Name, Term, ActingUser); {error, Reason} -> diff --git a/src/rabbit_vhost_limit.erl b/src/rabbit_vhost_limit.erl index 0181e300c3..d0c775f0bd 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, [return_maps]) of + case rabbit_json:try_decode(Definition) of {ok, Term} -> set(VHost, maps:to_list(Term), ActingUser); {error, Reason} -> |