diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-04-07 17:14:58 +0100 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-04-07 17:14:58 +0100 |
| commit | c258acf87e635fd6ffc67fcf6c3e6b4371ecae06 (patch) | |
| tree | 98fe56a51f7f2ec8836065dc7b38ad48ff6de106 /src | |
| parent | d2780fe4db57217fef31eb7fdf287c1cfe4d8483 (diff) | |
| download | rabbitmq-server-git-c258acf87e635fd6ffc67fcf6c3e6b4371ecae06.tar.gz | |
Naming
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mnesia.erl | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 96c9bffdc8..1db6102312 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -808,18 +808,19 @@ negotiate_protocol([Node]) -> mnesia_monitor:negotiate_protocol([Node]). with_running_or_clean_mnesia(Fun) -> - MnesiaRunning = case mnesia:system_info(is_running) of + IsMnesiaRunning = case mnesia:system_info(is_running) of + yes -> true; + no -> false; stopping -> ensure_mnesia_not_running(), - no; + false; starting -> ensure_mnesia_running(), - yes; - Other -> Other + true end, - case MnesiaRunning of - yes -> Fun(); - no -> + case IsMnesiaRunning of + true -> Fun(); + false -> {ok, MnesiaDir} = application:get_env(mnesia, dir), application:unset_env(mnesia, dir), mnesia:start(), |
