fielding 97/10/05 01:12:47
Modified: src/main http_log.c http_log.h http_main.c
Log:
APLOG_NOTICE is used for informational messages which no one in their
right mind would ever want to exclude from the error_log. It should
therefore have a low (high priority) level number.
Revision Changes Path
1.37 +1 -1 apachen/src/main/http_log.c
Index: http_log.c
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- http_log.c 1997/10/05 07:47:45 1.36
+++ http_log.c 1997/10/05 08:12:44 1.37
@@ -135,12 +135,12 @@
#endif
static TRANS priorities[] = {
+ {"notice", APLOG_NOTICE},
{"emerg", APLOG_EMERG},
{"alert", APLOG_ALERT},
{"crit", APLOG_CRIT},
{"error", APLOG_ERR},
{"warn", APLOG_WARNING},
- {"notice", APLOG_NOTICE},
{"info", APLOG_INFO},
{"debug", APLOG_DEBUG},
{NULL, -1},
1.15 +6 -6 apachen/src/main/http_log.h
Index: http_log.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_log.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- http_log.h 1997/10/05 07:47:45 1.14
+++ http_log.h 1997/10/05 08:12:44 1.15
@@ -50,12 +50,12 @@
*
*/
-#define APLOG_EMERG 0 /* system is unusable */
-#define APLOG_ALERT 1 /* action must be taken immediately */
-#define APLOG_CRIT 2 /* critical conditions */
-#define APLOG_ERR 3 /* error conditions */
-#define APLOG_WARNING 4 /* warning conditions */
-#define APLOG_NOTICE 5 /* normal but significant condition */
+#define APLOG_NOTICE 0 /* normal but significant condition */
+#define APLOG_EMERG 1 /* system is unusable */
+#define APLOG_ALERT 2 /* action must be taken immediately */
+#define APLOG_CRIT 3 /* critical conditions */
+#define APLOG_ERR 4 /* error conditions */
+#define APLOG_WARNING 5 /* warning conditions */
#define APLOG_INFO 6 /* informational */
#define APLOG_DEBUG 7 /* debug-level messages */
#define DEFAULT_LOGLEVEL APLOG_ERR
1.232 +7 -7 apachen/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- http_main.c 1997/10/05 07:47:46 1.231
+++ http_main.c 1997/10/05 08:12:45 1.232
@@ -719,7 +719,7 @@
}
if (!current_conn->keptalive)
- aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG,
+ aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING,
current_conn->server, errstr);
if (timeout_req) {
@@ -951,7 +951,8 @@
if (setsockopt(s, SOL_SOCKET, SO_LINGER,
(char *) &li, sizeof(struct linger)) < 0) {
- aplog_error(APLOG_MARK, APLOG_WARNING, server_conf, "setsockopt:
(SO_LINGER)");
+ aplog_error(APLOG_MARK, APLOG_WARNING, server_conf,
+ "setsockopt: (SO_LINGER)");
/* not a fatal error */
}
}
@@ -1948,7 +1949,7 @@
ap_snprintf(emsg, sizeof(emsg),
"httpd: caught %s, attempting to dump core in %s",
s, coredump_dir);
- aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, server_conf, emsg);
+ aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, server_conf, emsg);
chdir(coredump_dir);
abort();
exit(1);
@@ -3419,12 +3420,11 @@
hold_off_on_exponential_spawning = 10;
}
- aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, server_conf,
- "Apache HTTP Server version: %s", SERVER_VERSION);
+ aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, server_conf,
+ "%s configured -- resuming normal operations",
+ SERVER_VERSION);
aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, server_conf,
"Server built: %s", SERVER_BUILT);
- aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, server_conf,
- "Server configured -- resuming normal operations");
restart_pending = shutdown_pending = 0;
while (!restart_pending && !shutdown_pending) {
