diff options
author | John Christopher Anderson <jchris@apache.org> | 2009-02-01 02:43:00 +0000 |
---|---|---|
committer | John Christopher Anderson <jchris@apache.org> | 2009-02-01 02:43:00 +0000 |
commit | 6d79547b25282a7f75221152e87a310d6bbc7a2f (patch) | |
tree | 13b9d39c33ae328b7170b88621078c0f0601da7e /src/couchdb/couch_external_manager.erl | |
parent | 02e15395d8f4fa43e135e48d321c89cc9622a1a8 (diff) |
via davisp: external server launches on request to avoid runaway errors.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@739681 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_external_manager.erl')
-rw-r--r-- | src/couchdb/couch_external_manager.erl | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/src/couchdb/couch_external_manager.erl b/src/couchdb/couch_external_manager.erl index 9bcef57b..230a9b27 100644 --- a/src/couchdb/couch_external_manager.erl +++ b/src/couchdb/couch_external_manager.erl @@ -19,7 +19,8 @@ -include("couch_db.hrl"). start_link() -> - gen_server:start_link({local, couch_external_manager}, couch_external_manager, [], []). + gen_server:start_link({local, couch_external_manager}, + couch_external_manager, [], []). execute(UrlName, JsonReq) -> Pid = gen_server:call(couch_external_manager, {get, UrlName}), @@ -37,10 +38,6 @@ config_change("external", UrlName) -> init([]) -> Handlers = ets:new(couch_external_manager_handlers, [set, private]), - lists:foreach(fun({UrlName, Command}) -> - {ok, Pid} = couch_external_server:start_link(UrlName, Command), - true = ets:insert(Handlers, {UrlName, Pid}) - end, couch_config:get("external")), couch_config:register(fun config_change/2), {ok, Handlers}. @@ -52,14 +49,21 @@ terminate(_Reason, Handlers) -> ok. handle_call({get, UrlName}, _From, Handlers) -> - Resp = case ets:lookup(Handlers, UrlName) of - [{UrlName, Pid}] -> - Pid; + case ets:lookup(Handlers, UrlName) of [] -> - Mesg = lists:flatten(io_lib:format("No server configured for ~p.", [UrlName])), - {error, {unknown_external_server, Mesg}} - end, - {reply, Resp, Handlers}; + case couch_config:get("external", UrlName, nil) of + nil -> + Mesg = lists:flatten( + io_lib:format("No server configured for ~p.", [UrlName])), + {reply, {error, {unknown_external_server, Mesg}}, Handlers}; + Command -> + {ok, NewPid} = couch_external_server:start_link(UrlName, Command), + true = ets:insert(Handlers, {UrlName, NewPid}), + {reply, NewPid, Handlers} + end; + [{UrlName, Pid}] -> + {reply, Pid, Handlers} + end; handle_call({config, UrlName}, _From, Handlers) -> % A newly added handler and a handler that had it's command % changed are treated exactly the same. @@ -68,25 +72,17 @@ handle_call({config, UrlName}, _From, Handlers) -> case ets:lookup(Handlers, UrlName) of [{UrlName, Pid}] -> couch_external_server:stop(Pid); - _ -> + [] -> ok end, - case couch_config:get("external", UrlName, nil) of - % Handler no longer exists - nil -> - ok; - % New handler start up. - Command -> - {ok, NewPid} = couch_external_server:start_link(UrlName, Command), - true = ets:insert(Handlers, {Command, NewPid}) - end, + % Wait for next request to boot the handler. {reply, ok, Handlers}. handle_cast(_Whatever, State) -> {noreply, State}. handle_info({'EXIT', Reason, Pid}, Handlers) -> - ?LOG_DEBUG("External server ~p died. (reason: ~p)", [Pid, Reason]), + ?LOG_DEBUG("EXTERNAL: Server ~p died. (reason: ~p)", [Pid, Reason]), % Remove Pid from the handlers table so we don't try closing % it a second time in terminate/2. ets:match_delete(Handlers, {'_', Pid}), |