diff options
| author | Tim Watson <tim@rabbitmq.com> | 2014-01-24 12:11:29 +0000 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2014-01-24 12:11:29 +0000 |
| commit | d60152edecb769371f3f102040eff987129e07f0 (patch) | |
| tree | 518fab771db4981408a365d9aa602181d3f1d62a | |
| parent | 289cdb4fcd5f1e96194dbba16c2b6b3aa65a42a5 (diff) | |
| download | rabbitmq-server-git-d60152edecb769371f3f102040eff987129e07f0.tar.gz | |
Ignore clean.dot read/delete errors during upgrades
| -rw-r--r-- | src/rabbit_recovery_terms.erl | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/rabbit_recovery_terms.erl b/src/rabbit_recovery_terms.erl index 73bbb94ddc..352f70b511 100644 --- a/src/rabbit_recovery_terms.erl +++ b/src/rabbit_recovery_terms.erl @@ -71,21 +71,11 @@ upgrade_recovery_terms() -> fun(F, Acc) -> [F|Acc] end, []), [begin case rabbit_file:read_term_file(File) of - {ok, Terms} -> - rabbit_log:info("Read ~s ok~n", [File]), - ok = store(filename:basename(filename:dirname(File)), - Terms); - Err -> - rabbit_log:warning("Error reading recovery file ~s: ~p~n", - [File, Err]) + {ok, Terms} -> Key = filename:basename(filename:dirname(File)), + ok = store(Key, Terms); + _ -> ok end, - case file:delete(File) of - {error, E} -> - rabbit_log:warning("Unable to delete recovery index" - "~s during upgrade: ~p~n", [File, E]); - ok -> - ok - end + file:delete(File) end || File <- DotFiles], ok after |