diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-17 16:26:25 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-17 16:26:25 +0000 |
| commit | 3b05ad9f71030f8f9ee3a571cbe8ec1c7c88c2d4 (patch) | |
| tree | 357afd469a08bfd8f9b808a3195f612b04239997 | |
| parent | c5c260889317964b7a64d9e1c7908704e30f456e (diff) | |
| download | rabbitmq-server-git-3b05ad9f71030f8f9ee3a571cbe8ec1c7c88c2d4.tar.gz | |
rabbit:stop() is not always called when rabbit is stopping. E.g. q(). doesn't invoke rabbit:stop/0. It does invoke rabbit:stop/1 though.
| -rw-r--r-- | src/rabbit.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_mnesia.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index b1d88a522c..5f88b9972d 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -204,7 +204,6 @@ start() -> end. stop() -> - ok = rabbit_mnesia:record_running_disc_nodes(), ok = rabbit_misc:stop_applications(?APPS). stop_and_halt() -> @@ -246,6 +245,7 @@ start(normal, []) -> end. stop(_State) -> + ok = rabbit_mnesia:record_running_disc_nodes(), terminated_ok = error_logger:delete_report_handler(rabbit_error_logger), ok = rabbit_alarm:stop(), ok = case rabbit_mnesia:is_clustered() of diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 867da77914..4d3267a214 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -378,7 +378,7 @@ delete_cluster_nodes_config() -> end. running_nodes_filename() -> - dir() ++ "/nodes_running_at_shutdown". + filename:join(dir(), "nodes_running_at_shutdown"). record_running_disc_nodes() -> FileName = running_nodes_filename(), |