You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2011/12/03 00:19:04 UTC
svn commit: r1209777 - in /httpd/httpd/branches/2.4.x/include: ap_mmn.h
http_log.h
Author: sf
Date: Fri Dec 2 23:19:04 2011
New Revision: 1209777
URL: http://svn.apache.org/viewvc?rev=1209777&view=rev
Log:
Merge header parts of r1209743 and r1209773:
Add APLOGNO() macro for unique tags for every log message.
Modified:
httpd/httpd/branches/2.4.x/include/ap_mmn.h
httpd/httpd/branches/2.4.x/include/http_log.h
Modified: httpd/httpd/branches/2.4.x/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/ap_mmn.h?rev=1209777&r1=1209776&r2=1209777&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/ap_mmn.h (original)
+++ httpd/httpd/branches/2.4.x/include/ap_mmn.h Fri Dec 2 23:19:04 2011
@@ -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
Modified: httpd/httpd/branches/2.4.x/include/http_log.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/http_log.h?rev=1209777&r1=1209776&r2=1209777&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/http_log.h (original)
+++ httpd/httpd/branches/2.4.x/include/http_log.h Fri Dec 2 23:19:04 2011
@@ -109,6 +109,14 @@ extern "C" {
#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
* should not be used directly. Use ::APLOG_MARK or ::APLOG_MODULE_INDEX
Re: svn commit: r1209777 - in /httpd/httpd/branches/2.4.x/include: ap_mmn.h http_log.h
Posted by Stefan Fritsch <sf...@sfritsch.de>.
On Saturday 03 December 2011, Nick Kew wrote:
> On 2 Dec 2011, at 23:19, sf@apache.org wrote:
> > Modified:
> > httpd/httpd/branches/2.4.x/include/ap_mmn.h
> > httpd/httpd/branches/2.4.x/include/http_log.h
>
> [...]
>
> > + * 20111202.1 (2.5.0-dev) add APLOGNO()
>
> 2.4 or 2.5?
Changed it to 2.4. I guess we still need to update the comments in the
trunk and 2.4.x ap_mmn.h files after the dust has settled. I guess the
trunk file should get the history of 2.4.x, because that's what module
authors need to take into account.
>
> Isn't this incompatible with being in a near-release beta state?
> Could certainly use a couple of test releases before being
> set in stone!
There is no actual code change. Only a lot of strings added to error
messages.
But I would be fine with adding it later, too. Can some other people
please voice their opinions?
Re: svn commit: r1209777 - in /httpd/httpd/branches/2.4.x/include: ap_mmn.h http_log.h
Posted by Nick Kew <ni...@webthing.com>.
On 2 Dec 2011, at 23:19, sf@apache.org wrote:
> Modified:
> httpd/httpd/branches/2.4.x/include/ap_mmn.h
> httpd/httpd/branches/2.4.x/include/http_log.h
>
[...]
> + * 20111202.1 (2.5.0-dev) add APLOGNO()
2.4 or 2.5?
Isn't this incompatible with being in a near-release beta state?
Could certainly use a couple of test releases before being
set in stone!
--
Nick Kew