diff options
| author | Adam Kocoloski <adam@cloudant.com> | 2011-08-15 15:45:15 -0400 |
|---|---|---|
| committer | Adam Kocoloski <adam@cloudant.com> | 2011-08-15 15:45:15 -0400 |
| commit | 6ffe1675dd7b004e48891956a6bdbe32899ce80c (patch) | |
| tree | 57326d9a498481e65bb0db38c66daf10896801f1 /apps/couch/src/couch_event_sup.erl | |
| parent | 52ff89ff7996e839b9e2f91fd76184d362a8aeb0 (diff) | |
| parent | fdd1a5d0bc48b49b0df5c9217beff9574011283c (diff) | |
Merge branch '11554-merge-couchdb-1.1'
Diffstat (limited to 'apps/couch/src/couch_event_sup.erl')
| -rw-r--r-- | apps/couch/src/couch_event_sup.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/couch/src/couch_event_sup.erl b/apps/couch/src/couch_event_sup.erl index 6fd6963a..07c48790 100644 --- a/apps/couch/src/couch_event_sup.erl +++ b/apps/couch/src/couch_event_sup.erl @@ -50,8 +50,12 @@ stop(Pid) -> gen_server:cast(Pid, stop). init({EventMgr, EventHandler, Args}) -> - ok = gen_event:add_sup_handler(EventMgr, EventHandler, Args), - {ok, {EventMgr, EventHandler}}. + case gen_event:add_sup_handler(EventMgr, EventHandler, Args) of + ok -> + {ok, {EventMgr, EventHandler}}; + {stop, Error} -> + {stop, Error} + end. terminate(_Reason, _State) -> ok. |