diff options
author | Holger Weiss <holger@zedat.fu-berlin.de> | 2018-09-17 21:46:37 +0200 |
---|---|---|
committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2018-09-17 21:46:37 +0200 |
commit | d2cdfa66f945c1d00f66e11e042f770b379a9486 (patch) | |
tree | 4111c76d8c68369da63e7d66db905d58bcdf4b7d /src | |
parent | Revert "New option tombstone_expiry locks recent room creation after destroy ... (diff) |
mod_http_upload: Log error if 'put_url' is reused
Log a proper [error] message if a single 'put_url' is used for multiple
virtual hosts.
Diffstat (limited to 'src')
-rw-r--r-- | src/mod_http_upload.erl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/mod_http_upload.erl b/src/mod_http_upload.erl index 7e9816cbe..220ca1a64 100644 --- a/src/mod_http_upload.erl +++ b/src/mod_http_upload.erl @@ -122,7 +122,7 @@ %%-------------------------------------------------------------------- %% gen_mod/supervisor callbacks. %%-------------------------------------------------------------------- --spec start(binary(), gen_mod:opts()) -> {ok, pid()}. +-spec start(binary(), gen_mod:opts()) -> {ok, pid()} | {error, already_started}. start(ServerHost, Opts) -> case gen_mod:get_opt(rm_on_unregister, Opts) of true -> @@ -132,7 +132,14 @@ start(ServerHost, Opts) -> ok end, Proc = get_proc_name(ServerHost, ?MODULE), - gen_mod:start_child(?MODULE, ServerHost, Opts, Proc). + case whereis(Proc) of + undefined -> + gen_mod:start_child(?MODULE, ServerHost, Opts, Proc); + _Pid -> + ?ERROR_MSG("Multiple virtual hosts can't use a single 'put_url' " + "without the @HOST@ keyword", []), + {error, already_started} + end. -spec stop(binary()) -> ok | {error, any()}. stop(ServerHost) -> |