diff options
| -rw-r--r-- | include/rabbit.hrl | 2 | ||||
| -rw-r--r-- | src/rabbit_control.erl | 29 | ||||
| -rw-r--r-- | src/rabbit_mnesia.erl | 8 | ||||
| -rw-r--r-- | src/rabbit_registry.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_runtime_parameter.erl (renamed from src/rabbit_cluster_config_item.erl) | 2 | ||||
| -rw-r--r-- | src/rabbit_runtime_parameters.erl (renamed from src/rabbit_cluster_config.erl) | 18 | ||||
| -rw-r--r-- | src/rabbit_upgrade_functions.erl | 10 |
7 files changed, 38 insertions, 37 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 517a701006..5c73c8b88b 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -66,7 +66,7 @@ -record(listener, {node, protocol, host, ip_address, port}). --record(cluster_config, {key, value}). +-record(runtime_parameters, {key, value}). -record(basic_message, {exchange_name, routing_keys = [], content, id, is_persistent}). diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 671e354dfe..7ce2baebf9 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -267,20 +267,21 @@ action(list_user_permissions, Node, Args = [_Username], _Opts, Inform) -> list_user_permissions, Args}), rabbit_auth_backend_internal:user_perms_info_keys()); -action(set_config_item, Node, [AppName, Key, Value], _Opts, Inform) -> - Inform("Setting config item ~p for app ~p to ~p", [Key, AppName, Value]), - rpc_call(Node, rabbit_cluster_config, set, [list_to_atom(AppName), - list_to_atom(Key), Value]); - -action(clear_config_item, Node, [AppName, Key], _Opts, Inform) -> - Inform("Clearing config item ~p for app ~p", [Key, AppName]), - rpc_call(Node, rabbit_cluster_config, clear, [list_to_atom(AppName), - list_to_atom(Key)]); - -action(list_config_items, Node, Args = [], _Opts, Inform) -> - Inform("Listing config items", []), - display_info_list(rpc_call(Node, rabbit_cluster_config, list, Args), - rabbit_cluster_config:info_keys()); +action(set_parameter, Node, [AppName, Key, Value], _Opts, Inform) -> + Inform("Setting runtime parameter ~p for app ~p to ~p", + [Key, AppName, Value]), + rpc_call(Node, rabbit_runtime_parameters, set, [list_to_atom(AppName), + list_to_atom(Key), Value]); + +action(clear_parameter, Node, [AppName, Key], _Opts, Inform) -> + Inform("Clearing runtime parameter ~p for app ~p", [Key, AppName]), + rpc_call(Node, rabbit_runtime_parameters, clear, [list_to_atom(AppName), + list_to_atom(Key)]); + +action(list_runtime_parameters, Node, Args = [], _Opts, Inform) -> + Inform("Listing runtime parameters", []), + display_info_list(rpc_call(Node, rabbit_runtime_parameters, list, Args), + rabbit_runtime_parameters:info_keys()); action(list_queues, Node, Args, Opts, Inform) -> Inform("Listing queues", []), diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 996d502c41..6b12bd511c 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -296,11 +296,11 @@ table_definitions() -> [{record_name, exchange_serial}, {attributes, record_info(fields, exchange_serial)}, {match, #exchange_serial{name = exchange_name_match(), _='_'}}]}, - {rabbit_cluster_config, - [{record_name, cluster_config}, - {attributes, record_info(fields, cluster_config)}, + {rabbit_runtime_parameters, + [{record_name, runtime_parameters}, + {attributes, record_info(fields, runtime_parameters)}, {disc_copies, [node()]}, - {match, #cluster_config{_='_'}}]}, + {match, #runtime_parameters{_='_'}}]}, {rabbit_durable_queue, [{record_name, amqqueue}, {attributes, record_info(fields, amqqueue)}, diff --git a/src/rabbit_registry.erl b/src/rabbit_registry.erl index 5ed992e0e5..46c93503d2 100644 --- a/src/rabbit_registry.erl +++ b/src/rabbit_registry.erl @@ -95,9 +95,9 @@ sanity_check_module(ClassModule, Module) -> true -> ok end. -class_module(exchange) -> rabbit_exchange_type; -class_module(auth_mechanism) -> rabbit_auth_mechanism; -class_module(cluster_config) -> rabbit_cluster_config_item. +class_module(exchange) -> rabbit_exchange_type; +class_module(auth_mechanism) -> rabbit_auth_mechanism; +class_module(runtime_parameter) -> rabbit_runtime_parameter. %%--------------------------------------------------------------------------- diff --git a/src/rabbit_cluster_config_item.erl b/src/rabbit_runtime_parameter.erl index 093e92b58c..ea37fda194 100644 --- a/src/rabbit_cluster_config_item.erl +++ b/src/rabbit_runtime_parameter.erl @@ -14,7 +14,7 @@ %% Copyright (c) 2007-2012 VMware, Inc. All rights reserved. %% --module(rabbit_cluster_config_item). +-module(rabbit_runtime_parameter). -export([behaviour_info/1]). diff --git a/src/rabbit_cluster_config.erl b/src/rabbit_runtime_parameters.erl index 5b10004f03..47843552db 100644 --- a/src/rabbit_cluster_config.erl +++ b/src/rabbit_runtime_parameters.erl @@ -14,13 +14,13 @@ %% Copyright (c) 2007-2012 VMware, Inc. All rights reserved. %% --module(rabbit_cluster_config). +-module(rabbit_runtime_parameters). -include("rabbit.hrl"). -export([set/3, clear/2, list/0, lookup/3, info_keys/0]). --define(TABLE, rabbit_cluster_config). +-define(TABLE, rabbit_runtime_parameters). %%--------------------------------------------------------------------------- @@ -46,13 +46,13 @@ list() -> All = rabbit_misc:dirty_read_all(?TABLE), [[{app_name, AppName}, {key, Key}, - {value, format(Value)}] || #cluster_config{key = {AppName, Key}, - value = Value} <- All]. + {value, format(Value)}] || #runtime_parameters{key = {AppName, Key}, + value = Value} <- All]. lookup(AppName, Key, Default) -> case mnesia:dirty_read(?TABLE, {AppName, Key}) of [] -> lookup_missing(AppName, Key, Default); - [R] -> R#cluster_config.value + [R] -> R#runtime_parameters.value end. lookup_missing(AppName, Key, Default) -> @@ -61,19 +61,19 @@ lookup_missing(AppName, Key, Default) -> case mnesia:read(?TABLE, {AppName, Key}) of [] -> mnesia:write(?TABLE, c(AppName, Key, Default), write), Default; - [R] -> R#cluster_config.value + [R] -> R#runtime_parameters.value end end). -c(AppName, Key, Default) -> #cluster_config{key = {AppName, Key}, - value = Default}. +c(AppName, Key, Default) -> #runtime_parameters{key = {AppName, Key}, + value = Default}. info_keys() -> [app_name, key, value]. %%--------------------------------------------------------------------------- lookup_app(App) -> - case rabbit_registry:lookup_module(cluster_config, App) of + case rabbit_registry:lookup_module(runtime_parameter, App) of {error, not_found} -> exit({application_not_found, App}); {ok, Module} -> Module end. diff --git a/src/rabbit_upgrade_functions.erl b/src/rabbit_upgrade_functions.erl index 67ec151bb4..485ccc5f02 100644 --- a/src/rabbit_upgrade_functions.erl +++ b/src/rabbit_upgrade_functions.erl @@ -36,7 +36,7 @@ -rabbit_upgrade({exchange_scratch, mnesia, [trace_exchanges]}). -rabbit_upgrade({mirrored_supervisor, mnesia, []}). -rabbit_upgrade({topic_trie_node, mnesia, []}). --rabbit_upgrade({cluster_config, mnesia, []}). +-rabbit_upgrade({runtime_parameters, mnesia, []}). %% ------------------------------------------------------------------- @@ -57,7 +57,7 @@ -spec(exchange_scratch/0 :: () -> 'ok'). -spec(mirrored_supervisor/0 :: () -> 'ok'). -spec(topic_trie_node/0 :: () -> 'ok'). --spec(cluster_config/0 :: () -> 'ok'). +-spec(runtime_parameters/0 :: () -> 'ok'). -endif. @@ -187,9 +187,9 @@ topic_trie_node() -> {attributes, [trie_node, edge_count, binding_count]}, {type, ordered_set}]). -cluster_config() -> - create(rabbit_cluster_config, - [{record_name, cluster_config}, +runtime_parameters() -> + create(rabbit_runtime_parameters, + [{record_name, runtime_parameters}, {attributes, [key, value]}, {disc_copies, [node()]}]). |