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_request_handler.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_request_handler.erl')
| -rw-r--r-- | lib/inets/src/http_server/httpd_request_handler.erl | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl index 143d599edb..134576059d 100644 --- a/lib/inets/src/http_server/httpd_request_handler.erl +++ b/lib/inets/src/http_server/httpd_request_handler.erl @@ -630,21 +630,10 @@ decrease(N) when is_integer(N) -> decrease(N) -> N. -error_log(ReasonString, Info) -> +error_log(ReasonString, #mod{config_db = ConfigDB}) -> Error = lists:flatten( io_lib:format("Error reading request: ~s", [ReasonString])), - error_log(mod_log, Info, Error), - error_log(mod_disk_log, Info, Error). - -error_log(Mod, #mod{config_db = ConfigDB} = Info, String) -> - Modules = httpd_util:lookup(ConfigDB, modules, - [mod_get, mod_head, mod_log]), - case lists:member(Mod, Modules) of - true -> - Mod:error_log(Info, String); - _ -> - ok - end. + httpd_util:error_log(ConfigDB, Error). %%-------------------------------------------------------------------- |