summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandall Leeds <randall@apache.org>2013-01-26 06:28:20 -0800
committerRandall Leeds <randall@apache.org>2013-01-26 06:28:20 -0800
commitf9e4e8a6e426d1569fac4cd707bbd393b102147d (patch)
tree130f6c7694cd7f8db7799f0aea6c58d9e95df2ae
parent10a052a3eddbd7e89b553966895ee38a9ce439d4 (diff)
downloadcouchdb-1305-fix-isolate-db-crashes.tar.gz
don't handle case clause when death happens anyway1305-fix-isolate-db-crashes
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).
-rw-r--r--src/couchdb/couch_server.erl8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl
index daa3f37df..8189761c6 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) ->