Updated Branches: refs/heads/1305-fix-isolate-db-crashes 6f3feb09e -> f9e4e8a6e
don't handle case clause when death happens anyway Presumably the reason for the process exit is already logged by the exiting process (unlike an unexpected message of another sort which may not have been logged already). Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f9e4e8a6 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f9e4e8a6 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f9e4e8a6 Branch: refs/heads/1305-fix-isolate-db-crashes Commit: f9e4e8a6e426d1569fac4cd707bbd393b102147d Parents: 10a052a Author: Randall Leeds <[email protected]> Authored: Sat Jan 26 06:28:20 2013 -0800 Committer: Randall Leeds <[email protected]> Committed: Sat Jan 26 06:28:20 2013 -0800 ---------------------------------------------------------------------- src/couchdb/couch_server.erl | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/f9e4e8a6/src/couchdb/couch_server.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl index daa3f37..8189761 100644 --- a/src/couchdb/couch_server.erl +++ b/src/couchdb/couch_server.erl @@ -426,7 +426,7 @@ code_change(_OldVsn, State, _Extra) -> handle_info({'EXIT', _Pid, config_change}, Server) -> {noreply, shutdown, Server}; -handle_info({'EXIT', Pid, Reason}=Error, Server) -> +handle_info({'EXIT', Pid, Reason}, Server) -> Server2 = case ets:lookup(couch_dbs_by_pid, Pid) of [{Pid, Db}] -> DbName = Db#db.name, @@ -467,11 +467,7 @@ handle_info({'EXIT', Pid, Reason}=Error, Server) -> Server; [] -> Server#server{dbs_open = Server#server.dbs_open - 1} - end; - true -> - ?LOG_ERROR("Unexpected message, restarting couch_server: ~p", [Error]), - exit(kill), - Server + end end, {noreply, Server2}; handle_info(Error, _Server) ->
