Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0E7B611BEF for ; Tue, 5 Aug 2014 16:47:04 +0000 (UTC) Received: (qmail 99033 invoked by uid 500); 5 Aug 2014 16:47:03 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 98931 invoked by uid 500); 5 Aug 2014 16:47:03 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 98776 invoked by uid 99); 5 Aug 2014 16:47:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Aug 2014 16:47:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ACF4F9BFE44; Tue, 5 Aug 2014 16:47:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Date: Tue, 05 Aug 2014 16:47:34 -0000 Message-Id: <5a738976786442b1a7b59d9cd109006b@git.apache.org> In-Reply-To: <6d294a5a3c8043dc88311df0a41f8da6@git.apache.org> References: <6d294a5a3c8043dc88311df0a41f8da6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [34/34] couch commit: updated refs/heads/windsor-merge-209 to f2368da fix code_change in couch_proc_manager Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/f2368da9 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/f2368da9 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/f2368da9 Branch: refs/heads/windsor-merge-209 Commit: f2368da9421531a70b1114a2497ee06c97be2d0f Parents: 8e09de2 Author: Robert Newson Authored: Thu Sep 5 11:45:22 2013 +0100 Committer: Robert Newson Committed: Tue Aug 5 17:42:57 2014 +0100 ---------------------------------------------------------------------- src/couch_proc_manager.erl | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/f2368da9/src/couch_proc_manager.erl ---------------------------------------------------------------------- diff --git a/src/couch_proc_manager.erl b/src/couch_proc_manager.erl index 6a64fa7..2744c88 100644 --- a/src/couch_proc_manager.erl +++ b/src/couch_proc_manager.erl @@ -231,6 +231,8 @@ terminate(_Reason, #state{tab=Tab}) -> ets:foldl(fun(#proc_int{pid=P}, _) -> couch_util:shutdown_sync(P) end, 0, Tab), ok. +code_change(_OldVsn, #state{}=State, _Extra) -> + {ok, State}; code_change(_OldVsn, {state, Tab}, _Extra) -> State = #state{tab = Tab, threshold_ts = {0,0,0}}, ProcInts = lists:map(fun import_proc/1, ets:tab2list(Tab)),