]> granicus.if.org Git - ejabberd/commitdiff
mod_http_upload: Don't complain during shutdown
authorHolger Weiss <holger@zedat.fu-berlin.de>
Mon, 2 Nov 2015 22:46:58 +0000 (23:46 +0100)
committerHolger Weiss <holger@zedat.fu-berlin.de>
Mon, 2 Nov 2015 22:46:58 +0000 (23:46 +0100)
Ignore the case where, for some reason, no process is found to be
stopped.

Closes #810.

src/mod_http_upload.erl
src/mod_http_upload_quota.erl

index d3eace3537d6208a360c64d3da2635ba805a0320..c51c60e0b199980e08ee42e8c1887f08f54dd999 100644 (file)
@@ -148,8 +148,8 @@ stop(ServerHost) ->
       false -> ok
     end,
     Proc = get_proc_name(ServerHost, ?PROCNAME),
-    ok = supervisor:terminate_child(ejabberd_sup, Proc),
-    ok = supervisor:delete_child(ejabberd_sup, Proc).
+    supervisor:terminate_child(ejabberd_sup, Proc),
+    supervisor:delete_child(ejabberd_sup, Proc).
 
 -spec mod_opt_type(atom()) -> fun((term()) -> term()) | [atom()].
 
index 1b7828a54a2f7923a3703ec3c9a38788a5a2d017..6ff8c840b75d38dd1a54420f1532545904e9a064 100644 (file)
@@ -75,8 +75,8 @@ start(ServerHost, Opts) ->
 
 stop(ServerHost) ->
     Proc = mod_http_upload:get_proc_name(ServerHost, ?PROCNAME),
-    ok = supervisor:terminate_child(ejabberd_sup, Proc),
-    ok = supervisor:delete_child(ejabberd_sup, Proc).
+    supervisor:terminate_child(ejabberd_sup, Proc),
+    supervisor:delete_child(ejabberd_sup, Proc).
 
 -spec mod_opt_type(atom()) -> fun((term()) -> term()) | [atom()].