diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2011-03-22 17:52:19 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2011-03-22 17:52:19 +0000 |
| commit | 0c40701b76a01a0daed46f6b1fb6ef4326c83c31 (patch) | |
| tree | 5f2277d147001be6dc0b4b46e587e5a4afbf998b | |
| parent | 640ef6c818d73244ac0032e4dea7c80f223e8cdd (diff) | |
| download | rabbitmq-server-git-0c40701b76a01a0daed46f6b1fb6ef4326c83c31.tar.gz | |
cosmetic(ish): no need to match the return of ensure_*
| -rw-r--r-- | src/rabbit_mnesia.erl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 66436920d4..963d814e81 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -78,8 +78,8 @@ status() -> {running_nodes, running_clustered_nodes()}]. init() -> - ok = ensure_mnesia_running(), - ok = ensure_mnesia_dir(), + ensure_mnesia_running(), + ensure_mnesia_dir(), ok = init_db(read_cluster_nodes_config(), true), ok. @@ -98,8 +98,8 @@ force_cluster(ClusterNodes) -> %% node. If Force is false, only connections to online nodes are %% allowed. cluster(ClusterNodes, Force) -> - ok = ensure_mnesia_not_running(), - ok = ensure_mnesia_dir(), + ensure_mnesia_not_running(), + ensure_mnesia_dir(), rabbit_misc:ensure_ok(mnesia:start(), cannot_start_mnesia), try ok = init_db(ClusterNodes, Force), @@ -455,7 +455,7 @@ create_schema() -> rabbit_misc:ensure_ok(mnesia:start(), cannot_start_mnesia), ok = create_tables(), - ok = ensure_schema_integrity(), + ensure_schema_integrity(), ok = rabbit_upgrade:write_version(). move_db() -> @@ -476,7 +476,7 @@ move_db() -> {error, Reason} -> throw({error, {cannot_backup_mnesia, MnesiaDir, BackupDir, Reason}}) end, - ok = ensure_mnesia_dir(), + ensure_mnesia_dir(), rabbit_misc:ensure_ok(mnesia:start(), cannot_start_mnesia), ok. @@ -561,12 +561,12 @@ wait_for_tables(TableNames) -> end. reset(Force) -> - ok = ensure_mnesia_not_running(), + ensure_mnesia_not_running(), Node = node(), case Force of true -> ok; false -> - ok = ensure_mnesia_dir(), + ensure_mnesia_dir(), rabbit_misc:ensure_ok(mnesia:start(), cannot_start_mnesia), {Nodes, RunningNodes} = try |