From: Marcin Siodelski Date: Mon, 13 May 2019 15:21:23 +0000 (+0200) Subject: [#599,!320] Added log message when premature http timeout occurred. X-Git-Tag: Kea-1.6.0-beta~164 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bd2ab411c796dec555359490458e8a28c8267f3;p=thirdparty%2Fkea.git [#599,!320] Added log message when premature http timeout occurred. --- diff --git a/src/lib/http/client.cc b/src/lib/http/client.cc index c2c6b30f5f..adfd0ef5c7 100644 --- a/src/lib/http/client.cc +++ b/src/lib/http/client.cc @@ -535,6 +535,8 @@ Connection::isTransactionOngoing() const { bool Connection::checkPrematureTimeout() const { if (!isTransactionOngoing()) { + // The transaction state is was reset, so we need to log a warning message. + LOG_WARN(http_logger, HTTP_PREMATURE_CONNECTION_TIMEOUT_OCCURRED); return (true); } return (false); diff --git a/src/lib/http/http_messages.cc b/src/lib/http/http_messages.cc index cb84e76744..79a3cb346a 100644 --- a/src/lib/http/http_messages.cc +++ b/src/lib/http/http_messages.cc @@ -1,4 +1,4 @@ -// File created from ../../../src/lib/http/http_messages.mes on Fri Feb 08 2019 20:32 +// File created from ../../../src/lib/http/http_messages.mes on Mon May 13 2019 17:08 #include #include @@ -20,6 +20,7 @@ extern const isc::log::MessageID HTTP_CONNECTION_STOP = "HTTP_CONNECTION_STOP"; extern const isc::log::MessageID HTTP_CONNECTION_STOP_FAILED = "HTTP_CONNECTION_STOP_FAILED"; extern const isc::log::MessageID HTTP_DATA_RECEIVED = "HTTP_DATA_RECEIVED"; extern const isc::log::MessageID HTTP_IDLE_CONNECTION_TIMEOUT_OCCURRED = "HTTP_IDLE_CONNECTION_TIMEOUT_OCCURRED"; +extern const isc::log::MessageID HTTP_PREMATURE_CONNECTION_TIMEOUT_OCCURRED = "HTTP_PREMATURE_CONNECTION_TIMEOUT_OCCURRED"; extern const isc::log::MessageID HTTP_REQUEST_RECEIVE_START = "HTTP_REQUEST_RECEIVE_START"; extern const isc::log::MessageID HTTP_SERVER_RESPONSE_RECEIVED = "HTTP_SERVER_RESPONSE_RECEIVED"; extern const isc::log::MessageID HTTP_SERVER_RESPONSE_RECEIVED_DETAILS = "HTTP_SERVER_RESPONSE_RECEIVED_DETAILS"; @@ -45,6 +46,7 @@ const char* values[] = { "HTTP_CONNECTION_STOP_FAILED", "stopping HTTP connection failed", "HTTP_DATA_RECEIVED", "received %1 bytes from %2", "HTTP_IDLE_CONNECTION_TIMEOUT_OCCURRED", "closing persistent connection with %1 as a result of a timeout", + "HTTP_PREMATURE_CONNECTION_TIMEOUT_OCCURRED", "premature connection timeout occurred, possibly caused by system clock change", "HTTP_REQUEST_RECEIVE_START", "start receiving request from %1 with timeout %2", "HTTP_SERVER_RESPONSE_RECEIVED", "received HTTP response from %1", "HTTP_SERVER_RESPONSE_RECEIVED_DETAILS", "detailed information about well formed response received from %1:\n%2", diff --git a/src/lib/http/http_messages.h b/src/lib/http/http_messages.h index 3f3788489c..658b081088 100644 --- a/src/lib/http/http_messages.h +++ b/src/lib/http/http_messages.h @@ -1,4 +1,4 @@ -// File created from ../../../src/lib/http/http_messages.mes on Fri Feb 08 2019 20:32 +// File created from ../../../src/lib/http/http_messages.mes on Mon May 13 2019 17:08 #ifndef HTTP_MESSAGES_H #define HTTP_MESSAGES_H @@ -21,6 +21,7 @@ extern const isc::log::MessageID HTTP_CONNECTION_STOP; extern const isc::log::MessageID HTTP_CONNECTION_STOP_FAILED; extern const isc::log::MessageID HTTP_DATA_RECEIVED; extern const isc::log::MessageID HTTP_IDLE_CONNECTION_TIMEOUT_OCCURRED; +extern const isc::log::MessageID HTTP_PREMATURE_CONNECTION_TIMEOUT_OCCURRED; extern const isc::log::MessageID HTTP_REQUEST_RECEIVE_START; extern const isc::log::MessageID HTTP_SERVER_RESPONSE_RECEIVED; extern const isc::log::MessageID HTTP_SERVER_RESPONSE_RECEIVED_DETAILS; diff --git a/src/lib/http/http_messages.mes b/src/lib/http/http_messages.mes index 2c8e5cc8ed..5ba4614777 100644 --- a/src/lib/http/http_messages.mes +++ b/src/lib/http/http_messages.mes @@ -83,6 +83,12 @@ produced the data. This debug message is issued when the persistent HTTP connection is being closed as a result of being idle. +% HTTP_PREMATURE_CONNECTION_TIMEOUT_OCCURRED premature connection timeout occurred, possibly caused by system clock change +This warning message is issued when unexpected timeout occurred during the +transaction. This is proven to occur when the system clock is moved manually +or as a result of synchronization with a time server. Any ongoing transactions +will be interrupted. New transactions should be conducted normally. + % HTTP_REQUEST_RECEIVE_START start receiving request from %1 with timeout %2 This debug message is issued when the server starts receiving new request over the established connection. The first argument specifies the address