summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2017-03-22 23:38:25 +0300
committerMichael Klishin <michael@clojurewerkz.org>2017-03-22 23:38:25 +0300
commit89b049eb9e41c605e6d33fcc1f818c3c0a0d049d (patch)
treefcdf9e7ac89dc61212176510b79d237221badae4
parentcb5659c237b01783d24f689d8636795af325cb53 (diff)
parentf6da25c25524a5d36cb278d0a98dc2fa456cd6ac (diff)
downloadrabbitmq-server-git-89b049eb9e41c605e6d33fcc1f818c3c0a0d049d.tar.gz
Merge branch 'embed-friendly' of https://github.com/binarin/rabbitmq-server into binarin-embed-friendly
-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.