diff options
author | Matthias Radestock <matthias@rabbitmq.com> | 2010-11-12 17:45:39 +0000 |
---|---|---|
committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-11-12 17:45:39 +0000 |
commit | 7a35932177e46efc96f45250832c39350063ceee (patch) | |
tree | 4e9c52a646b442e9fc2c5965bc3df1361a264523 | |
parent | 5b7457c08325814cea0c69434d52e040ca2409bc (diff) | |
download | rabbitmq-server-7a35932177e46efc96f45250832c39350063ceee.tar.gz |
cosmetic
-rw-r--r-- | src/rabbit_upgrade.erl | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index 4ecef7ee..9522227e 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -66,8 +66,8 @@ maybe_upgrade() -> read_version() -> case rabbit_misc:read_term_file(schema_filename()) of - {ok, [Heads]} -> {ok, Heads}; - {error, _E} = Err -> Err + {ok, [Heads]} -> {ok, Heads}; + {error, _} = Err -> Err end. write_version() -> @@ -111,8 +111,8 @@ upgrades_to_apply(Heads, G) -> sets:from_list(digraph_utils:reaching(Heads, G)))), %% Form a subgraph from that list and find a topological ordering %% so we can invoke them in order. - [element(2, digraph:vertex(G, StepName)) - || StepName <- digraph_utils:topsort(digraph_utils:subgraph(G, Unsorted))]. + [element(2, digraph:vertex(G, StepName)) || + StepName <- digraph_utils:topsort(digraph_utils:subgraph(G, Unsorted))]. heads(G) -> lists:sort([V || V <- digraph:vertices(G), digraph:out_degree(G, V) =:= 0]). @@ -141,16 +141,12 @@ apply_upgrade({M, F}) -> %% ------------------------------------------------------------------- -schema_filename() -> - filename:join(dir(), ?VERSION_FILENAME). +dir() -> rabbit_mnesia:dir(). -lock_filename() -> - filename:join(dir(), ?LOCK_FILENAME). +schema_filename() -> filename:join(dir(), ?VERSION_FILENAME). + +lock_filename() -> filename:join(dir(), ?LOCK_FILENAME). %% NB: we cannot use rabbit_log here since it may not have been %% started yet -info(Msg, Args) -> - error_logger:info_msg(Msg, Args). - -dir() -> - rabbit_mnesia:dir(). +info(Msg, Args) -> error_logger:info_msg(Msg, Args). |