diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-11-18 10:58:22 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-11-27 16:21:32 +0100 |
| commit | ebbbd714ad2398858b09065bce82830d8affe2a4 (patch) | |
| tree | 8a8851d7053492d8a045e07b5dce2c26a9476f76 /lib/inets/src/http_server/httpd_util.erl | |
| parent | 7096f9228af1cdf98843660560a0d84b48cf766b (diff) | |
| download | otp-ebbbd714ad2398858b09065bce82830d8affe2a4.tar.gz otp-ebbbd714ad2398858b09065bce82830d8affe2a4.tar.bz2 otp-ebbbd714ad2398858b09065bce82830d8affe2a4.zip | |
inets: Add warning header in "chunk trailer" when mod_esi callback times out or fails
Also remove legacy debug macros and add help function httpd_util:error_log/2
to avoid code duplication.
Diffstat (limited to 'lib/inets/src/http_server/httpd_util.erl')
| -rw-r--r-- | lib/inets/src/http_server/httpd_util.erl | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/inets/src/http_server/httpd_util.erl b/lib/inets/src/http_server/httpd_util.erl index 0387d71911..ab43f0b378 100644 --- a/lib/inets/src/http_server/httpd_util.erl +++ b/lib/inets/src/http_server/httpd_util.erl @@ -31,7 +31,7 @@ convert_netscapecookie_date/1, enable_debug/1, valid_options/3, modules_validate/1, module_validate/1, dir_validate/2, file_validate/2, mime_type_validate/1, - mime_types_validate/1, custom_date/0]). + mime_types_validate/1, custom_date/0, error_log/2]). -export([encode_hex/1, decode_hex/1]). -include_lib("kernel/include/file.hrl"). @@ -776,3 +776,17 @@ do_enable_debug([{Level,Modules}|Rest]) ok end, do_enable_debug(Rest). + +error_log(ConfigDb, Error) -> + error_log(mod_log, ConfigDb, Error), + error_log(mod_disk_log, ConfigDb, Error). + +error_log(Mod, ConfigDB, Error) -> + Modules = httpd_util:lookup(ConfigDB, modules, + [mod_get, mod_head, mod_log]), + case lists:member(Mod, Modules) of + true -> + Mod:report_error(ConfigDB, Error); + _ -> + ok + end. |