X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=res%2Blog%2Fgw-log.c;h=3a5e6f576f329122722019b93e5e8c21b85d2910;hb=3ac0f5a14ccdf730f747a77d320d2fe43bbcf3f6;hp=961963a80108ecd4a89f285daf0c6fba83f95063;hpb=3f6af0f3aa9f114cf562c28f2ed0b954e4c5d659;p=egate.git diff --git a/res+log/gw-log.c b/res+log/gw-log.c index 961963a..3a5e6f5 100644 --- a/res+log/gw-log.c +++ b/res+log/gw-log.c @@ -1,19 +1,86 @@ /* - gw-log.c: Implementation of logging facilities. - - Europagate, 1994-1995. - - gw-log.c,v + * Copyright (c) 1995, the EUROPAGATE consortium (see below). + * + * The EUROPAGATE consortium members are: + * + * University College Dublin + * Danmarks Teknologiske Videnscenter + * An Chomhairle Leabharlanna + * Consejo Superior de Investigaciones Cientificas + * + * Permission to use, copy, modify, distribute, and sell this software and + * its documentation, in whole or in part, for any purpose, is hereby granted, + * provided that: + * + * 1. This copyright and permission notice appear in all copies of the + * software and its documentation. Notices of copyright or attribution + * which appear at the beginning of any file must remain unchanged. + * + * 2. The names of EUROPAGATE or the project partners may not be used to + * endorse or promote products derived from this software without specific + * prior written permission. + * + * 3. Users of this software (implementors and gateway operators) agree to + * inform the EUROPAGATE consortium of their use of the software. This + * information will be used to evaluate the EUROPAGATE project and the + * software, and to plan further developments. The consortium may use + * the information in later publications. + * + * 4. Users of this software agree to make their best efforts, when + * documenting their use of the software, to acknowledge the EUROPAGATE + * consortium, and the role played by the software in their work. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND, + * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY + * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + * IN NO EVENT SHALL THE EUROPAGATE CONSORTIUM OR ITS MEMBERS BE LIABLE + * FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF + * ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA + * OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND + * ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE + * USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ +/* + * Implementation of logging facilities. + * + * Europagate, 1994-1995. + * + * $Log: gw-log.c,v $ + * Revision 1.12 1995/12/01 12:24:17 adam + * New function: gw_log_mask_str. + * + * Revision 1.11 1995/11/09 09:54:28 adam + * More readable logging format. + * + * Revision 1.10 1995/05/16 09:40:48 adam + * LICENSE. + * + * Revision 1.9 1995/04/19 12:12:06 adam + * Resource system uses only one log debug level. + * + * Revision 1.8 1995/04/17 09:36:16 adam + * Minor changes. + * + * Revision 1.7 1995/04/10 13:20:25 adam + * Use gettimeofday(2) instead of time(2) to get log time in milliseconds. + * + * Revision 1.6 1995/03/28 08:01:51 adam + * Bug fix: GW_LOG_ERRNO. + * + * Revision 1.5 1995/03/27 12:51:10 adam + * New log level in use: GW_LOG_ERRNO. + * + * Revision 1.4 1995/02/23 08:32:22 adam + * Changed header. + * * Revision 1.2 1995/02/17 17:06:56 adam * Remove everything before '/' in app_name. Use compact date format. * * Revision 1.1.1.1 1995/02/09 17:27:12 adam * Initial version of email gateway under CVS control. * - - Initial: Dec 7, 94 (Adam Dickmeiss) - Last update: Dec 13, 94 (Adam Dickmeiss) - + * Initial: Dec 7, 94 (Adam Dickmeiss) */ #include @@ -21,8 +88,11 @@ #include #include #include +#include #include #include +#include +#include #include @@ -122,13 +192,14 @@ int gw_log_file (unsigned level_a, const char *fname_a) int gw_log (unsigned level_a, const char *event_type, const char *format, ...) { - static char emit_str[2048]; + static char emit_str[4096]; struct file_mask *list; + struct timeval tv; + struct timezone tz; va_list ap; unsigned e_level = level_a & level; int count; int err = 0; - time_t time_now; struct tm tms; char *cp; @@ -136,17 +207,24 @@ int gw_log (unsigned level_a, const char *event_type, const char *format, ...) return 0; va_start (ap, format); - time (&time_now); - memcpy (&tms, localtime (&time_now), sizeof(tms)); - sprintf (emit_str, "%s %d %02d%02d%02d%02d%02d%02d %d %s ", + gettimeofday (&tv, &tz); + + memcpy (&tms, localtime (&tv.tv_sec), sizeof(tms)); + sprintf (emit_str, "%s %d %02d%02d%02d %02d%02d%02d %03d %d %s ", app_name, session, - tms.tm_year, tms.tm_mon, tms.tm_mday, + tms.tm_year, 1+tms.tm_mon, tms.tm_mday, tms.tm_hour, tms.tm_min, tms.tm_sec, + (int) (tv.tv_usec/1000), e_level, event_type); if ((cp = strchr (emit_str, '\n'))) /* remove \n from ctime-str */ *cp = ' '; count = strlen (emit_str); vsprintf (emit_str+count, format, ap); + if (level_a & GW_LOG_ERRNO) + { + strcat (emit_str, ": "); + strcat (emit_str, strerror (errno)); + } strcat (emit_str, "\n"); count = strlen (emit_str); @@ -163,3 +241,59 @@ int gw_log (unsigned level_a, const char *event_type, const char *format, ...) va_end (ap); return err; } + +static struct { + int mask; + char *name; +} mask_names[] = +{ + { GW_LOG_ALL, "all" }, + { GW_LOG_DEFAULT, "default"}, + { GW_LOG_DEFAULT, "def" }, + { GW_LOG_FATAL, "fatal" }, + { GW_LOG_WARN, "warn" }, + { GW_LOG_ACCT, "acct" }, + { GW_LOG_STAT, "stat" }, + { GW_LOG_DEBUG, "debug" }, + { GW_LOG_DEBUGN(0), "debug0" }, + { GW_LOG_DEBUGN(1), "debug1" }, + { GW_LOG_DEBUGN(2), "debug2" }, + { GW_LOG_DEBUGN(3), "debug3" }, + { GW_LOG_DEBUGN(4), "debug4" }, + { GW_LOG_DEBUGN(5), "debug5" }, + { GW_LOG_DEBUGN(6), "debug6" }, + { GW_LOG_DEBUGN(7), "debug7" }, + { GW_LOG_DEBUGN(8), "debug8" }, + { GW_LOG_DEBUGN(8), "debug9" }, + { 0, "none" }, + { 0, NULL } +}; + +unsigned gw_log_mask_str (const char *str) +{ + const char *p; + int i; + unsigned level = GW_LOG_DEFAULT; + + while (*str) + { + for (p = str; *p && *p != ','; p++) + ; + if (*str == '-' || isdigit(*str)) + level = atoi (str); + else + for (i = 0; mask_names[i].name; i++) + if (strlen (mask_names[i].name) == p-str && + memcmp (mask_names[i].name, str, p-str) == 0) + { + if (mask_names[i].mask) + level |= mask_names[i].mask; + else + level = 0; + } + if (*p == ',') + p++; + str = p; + } + return level; +}