randy 97/08/31 19:49:48
Modified: src/modules/standard mod_status.c mod_unique_id.c Log: Complete src/modules/standard module conversion of log_*() to aplog_error. Revision Changes Path 1.61 +2 -1 apachen/src/modules/standard/mod_status.c Index: mod_status.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_status.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- mod_status.c 1997/08/18 13:12:18 1.60 +++ mod_status.c 1997/09/01 02:49:44 1.61 @@ -240,7 +240,8 @@ status[SERVER_GRACEFUL]='G'; if (!exists_scoreboard_image()) { - log_printf(r->server, "Server status unavailable in inetd mode"); + aplog_error(APLOG_MARK, APLOG_ERR, r->server, + "Server status unavailable in inetd mode"); return HTTP_NOT_IMPLEMENTED; } r->allowed = (1 << M_GET) | (1 << M_TRACE); 1.2 +13 -7 apachen/src/modules/standard/mod_unique_id.c Index: mod_unique_id.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_unique_id.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_unique_id.c 1997/08/18 07:17:30 1.1 +++ mod_unique_id.c 1997/09/01 02:49:45 1.2 @@ -144,7 +144,10 @@ */ if (XtOffsetOf (unique_id_rec, counter) + sizeof (cur_unique_id.counter) != 14) { - log_error ("mod_unique_id: sorry the size assumptions are wrong in mod_unique_id.c, please remove it from your server or fix the code!", s); + aplog_error(APLOG_MARK, APLOG_ALERT, s, + "mod_unique_id: sorry the size assumptions are wrong " + "in mod_unique_id.c, please remove it from your server " + "or fix the code!"); exit (1); } @@ -153,20 +156,22 @@ * to be unique as the physical address of the machine */ if (gethostname (str, sizeof (str) - 1) != 0) { - log_unixerr ("gethostname", "mod_unique_id", - "mod_unique_id requires the hostname of the server", s); + aplog_error(APLOG_MARK, APLOG_ALERT, s, + "gethostname: mod_unique_id requires the hostname of the server"); exit (1); } if ((hent = gethostbyname (str)) == NULL) { - log_printf (s, "mod_unique_id: unable to gethostbyname(\"%s\")", str); + aplog_error(APLOG_MARK, APLOG_ALERT, s, + "mod_unique_id: unable to gethostbyname(\"%s\")", str); exit (1); } global_in_addr = ((struct in_addr *)hent->h_addr_list[0])->s_addr; - log_printf (s, "mod_unique_id: using ip addr %s", - inet_ntoa (*(struct in_addr *)hent->h_addr_list[0])); + aplog_error(APLOG_MARK, APLOG_INFO, s, + "mod_unique_id: using ip addr %s", + inet_ntoa (*(struct in_addr *)hent->h_addr_list[0])); /* If the server is pummelled with restart requests we could possibly * end up in a situation where we're starting again during the same @@ -219,7 +224,8 @@ * test this during global_init ... but oh well. */ if (cur_unique_id.pid != pid) { - log_error ("mod_unique_id: oh no! pids are greater than 16-bits! I'm broken!", s); + aplog_error(APLOG_MARK, APLOG_DEBUG, s, + "oh no! pids are greater than 16-bits! I'm broken!"); } cur_unique_id.in_addr = global_in_addr;