couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject couch commit: updated refs/heads/master to c35005e
Date Wed, 21 May 2014 10:15:52 GMT
Repository: couchdb-couch
Updated Branches:
  refs/heads/master 34981ceff -> c35005e11


Ignore failure to stop https server

Mochiweb's stop() call is now synchronous and so attempting to stop a
mochiweb server that is not running will now cause an error. Ignore
this error when stopping 'https' as it is caused by not it not running
in the first place.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/c35005e1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/c35005e1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/c35005e1

Branch: refs/heads/master
Commit: c35005e11b015a7ef77fc4fc5cadc04e3eb818d7
Parents: 34981ce
Author: Robert Newson <rnewson@apache.org>
Authored: Wed May 21 11:14:38 2014 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Wed May 21 11:14:38 2014 +0100

----------------------------------------------------------------------
 src/couch_httpd.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/c35005e1/src/couch_httpd.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd.erl b/src/couch_httpd.erl
index a564d75..8e46b94 100644
--- a/src/couch_httpd.erl
+++ b/src/couch_httpd.erl
@@ -142,7 +142,7 @@ start_link(Name, Options) ->
 
 stop() ->
     mochiweb_http:stop(couch_httpd),
-    mochiweb_http:stop(https).
+    catch mochiweb_http:stop(https).
 
 
 set_auth_handlers() ->


Mime
View raw message