Merge header parts of r1209743 and r1209773:

Add APLOGNO() macro for unique tags for every log message.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209777 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 60d259b91a9e4c833f8a2d69ad1128db9f9dab98..4e539db7510f43a7ba40fd4673e22ca19a9ab1ed 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -373,6 +373,7 @@
  *                         c->remote_addr becomes c->peer_addr and r->client_addr
  * 20111201.0 (2.5.0-dev)  Add invalidate_entity() to the cache provider.
  * 20111202.0 (2.5.0-dev)  Use apr_status_t across mod_session API.
+ * 20111202.1 (2.5.0-dev)  add APLOGNO()
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -380,7 +381,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20111202
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 0                   /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 1                   /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

diff --git a/include/http_log.h b/include/http_log.h
index 68a6c8f20dd8bc4a72b47abdea100ebd408743ab..66ed59ca7d95fbc8206c90991fa23fea05e98f1a 100644 (file)
--- a/include/http_log.h
+++ b/include/http_log.h
@@ -108,6 +108,14 @@ extern "C" {
 #define DEFAULT_LOGLEVEL        APLOG_WARNING
 #endif
 
+/**
+ * APLOGNO() should be used at the start of the format string passed
+ * to ap_log_error() and friends. The argument must be a 5 digit decimal
+ * number. It creates a tag of the form "AH02182: "
+ * See docs/log-message-tags/README for details.
+ */
+#define APLOGNO(n)              "AH" #n ": "
+
 /**
  * APLOG_NO_MODULE may be passed as module_index to ap_log_error() and related
  * functions if the module causing the log message is not known. Normally this