summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Lebedeff <alebedev@mirantis.com>2017-03-16 18:13:20 +0300
committerMichael Klishin <michael@clojurewerkz.org>2017-03-23 00:42:22 +0300
commit0220389f09fd15194cc93726cdbff64b46c43293 (patch)
tree3f215b53ad0af3a1d521b7bc5060eb5cdfa88173
parent7fc24e63ccba2348d15b129223b63a17bf1f034f (diff)
downloadrabbitmq-server-git-0220389f09fd15194cc93726cdbff64b46c43293.tar.gz
Add back mnesia dir reset/restore
Use a more descriptive variable name, which explains why this can't be actually squashed into a single call to rabbit_mnesia:dir/0.
-rw-r--r--src/rabbit_mnesia.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 08e4e2e2d5..67d9836083 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -840,11 +840,12 @@ with_running_or_clean_mnesia(Fun) ->
case IsMnesiaRunning of
true -> Fun();
false ->
+ SavedMnesiaDir = dir(),
application:unset_env(mnesia, dir),
mnesia:start(),
Result = Fun(),
application:stop(mnesia),
- application:set_env(mnesia, dir, dir()),
+ application:set_env(mnesia, dir, SavedMnesiaDir),
Result
end.