summaryrefslogtreecommitdiff
path: root/src/mod_http_fileserver.erl
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2018-06-14 14:00:47 +0300
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2018-06-14 14:00:47 +0300
commitfd8e07af4789be362a61755ea47f216baeb64989 (patch)
tree0ac0a7a779fd27e79e940519441161dc0c4dfd5f /src/mod_http_fileserver.erl
parentLog modules startup (diff)
Get rid of ejabberd.hrl header
The header consisted of too many unrelated stuff and macros misuse. Some stuff is moved into scram.hrl and type_compat.hrl. All macros have been replaced with the corresponding function calls. TODO: probably type_compat.hrl is not even needed anymore since we support only Erlang >= OTP 17.5
Diffstat (limited to 'src/mod_http_fileserver.erl')
-rw-r--r--src/mod_http_fileserver.erl5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mod_http_fileserver.erl b/src/mod_http_fileserver.erl
index 0175456d..47cf31bc 100644
--- a/src/mod_http_fileserver.erl
+++ b/src/mod_http_fileserver.erl
@@ -45,7 +45,6 @@
-export([reopen_log/0, mod_opt_type/1, mod_options/1, depends/2]).
--include("ejabberd.hrl").
-include("logger.hrl").
-include("ejabberd_http.hrl").
-include_lib("kernel/include/file.hrl").
@@ -277,7 +276,7 @@ process(LocalPath, #request{host = Host, auth = Auth, headers = RHeaders} = Requ
"but couldn't find the related "
"ejabberd virtual host", [Host]),
{FileSize1, Code1, Headers1, Contents1} = ?HTTP_ERR_HOST_UNKNOWN,
- add_to_log(FileSize1, Code1, Request#request{host = ?MYNAME}),
+ add_to_log(FileSize1, Code1, Request#request{host = ejabberd_config:get_myname()}),
{Code1, Headers1, Contents1}
end.
@@ -383,7 +382,7 @@ reopen_log() ->
lists:foreach(
fun(Host) ->
gen_server:cast(get_proc_name(Host), reopen_log)
- end, ?MYHOSTS).
+ end, ejabberd_config:get_myhosts()).
add_to_log(FileSize, Code, Request) ->
gen_server:cast(get_proc_name(Request#request.host),