sctemme 2003/06/25 11:03:19
Modified: specweb99/specweb99-2.0 mod_specweb99.c mod_specweb99.h
Log:
Clean up debug logging to the error log. This code is only compiled when
Apache (and hence apxs) is compiled with -DDEBUG, so you usually don't see
it. I took the macro in the header file from the 1.3 module and set the
status parameter to 0... I don't see this value show up in the output so
I guess that's OK. Tested on Darwin 6.6 and Solaris 7.
Revision Changes Path
1.27 +2 -3 httpd-test/specweb99/specweb99-2.0/mod_specweb99.c
Index: mod_specweb99.c
===================================================================
RCS file: /home/cvs/httpd-test/specweb99/specweb99-2.0/mod_specweb99.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mod_specweb99.c 3 Mar 2003 19:20:58 -0000 1.26
+++ mod_specweb99.c 25 Jun 2003 18:03:18 -0000 1.27
@@ -886,8 +886,7 @@
filename = ap_make_full_path(r->pool, docroot, r->args);
#ifdef DEBUG
- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
- "Full path is '%s'", filename);
+ specweb99_debug(r->server, apr_psprintf(r->pool, "Full path is '%s'",
filename));
#endif
/*
* Calculate UserIndex into User.Personality file UserIndex = MyUser -
@@ -1223,7 +1222,7 @@
char *end;
time_t cur_time;
#ifdef DEBUG
- specweb99_debug(r->server, ap_psprintf(r->pool,
+ specweb99_debug(r->server, apr_psprintf(r->pool,
"Got a cookie: %s", cookie_in));
#endif
/*
1.4 +11 -1 httpd-test/specweb99/specweb99-2.0/mod_specweb99.h
Index: mod_specweb99.h
===================================================================
RCS file: /home/cvs/httpd-test/specweb99/specweb99-2.0/mod_specweb99.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_specweb99.h 3 Feb 2003 17:11:02 -0000 1.3
+++ mod_specweb99.h 25 Jun 2003 18:03:18 -0000 1.4
@@ -46,7 +46,7 @@
* SUCH DAMAGE.
* ====================================================================
*
- * This software was contributed by Covalent Technologies Inc,
+ * This software was contributed by Covalent Technologies Inc,
* http://www.covalent.net around April 20002.
*
* mod_specweb99.h -- Header file for Apache specweb99 module
@@ -131,5 +131,15 @@
apr_uint16_t minimum_match_value;
apr_uint32_t expiration_time;
};
+
+#ifdef DEBUG
+/* Macro to log debug messages with standardized parameters. */
+#define specweb99_debug(s,mess) { if (s) ap_log_error(APLOG_MARK, \
+ APLOG_NOERRNO|APLOG_DEBUG, 0, \
+ (s), (mess)); \
+ else \
+ fprintf(stderr,(mess)); \
+ }
+#endif
#endif
