X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Flog.c;h=1a5e6b5a86026e020367252208be0ea56a2ac55f;hb=38e70c83aac4fabf9280fa246921e57d725424de;hp=0c726b6c5d25a56fd43638a878ae37dd3063083f;hpb=c23776e0c46dc3ae8bff5e4f4a2086a44fedbf07;p=yaz-moved-to-github.git diff --git a/src/log.c b/src/log.c index 0c726b6..1a5e6b5 100644 --- a/src/log.c +++ b/src/log.c @@ -1,8 +1,8 @@ /* - * Copyright (c) 1995-2004, Index Data + * Copyright (C) 1995-2005, Index Data ApS * See the file LICENSE for details. * - * $Id: log.c,v 1.13 2004-11-09 20:54:08 adam Exp $ + * $Id: log.c,v 1.25 2005-06-25 15:46:04 adam Exp $ */ /** @@ -35,7 +35,7 @@ #include #include #include -#include +#include static NMEM_MUTEX log_mutex = 0; static int mutex_init_flag = 0; /* not yet initialized */ @@ -55,7 +55,7 @@ char *strerror(int n) -static int l_level = LOG_DEFAULT_LEVEL; +static int l_level = YLOG_DEFAULT_LEVEL; static FILE *l_file = NULL; static char l_prefix[512] = ""; static char l_prefix2[512] = ""; @@ -77,23 +77,24 @@ static struct { char *name; } mask_names[MAX_MASK_NAMES] = { - { LOG_FATAL, "fatal"}, - { LOG_DEBUG, "debug"}, - { LOG_WARN, "warn" }, - { LOG_LOG, "log" }, - { LOG_ERRNO, ""}, - { LOG_MALLOC, "malloc"}, - { LOG_APP, "app" }, - { LOG_NOTIME, "" }, - { LOG_APP2, "app2" }, - { LOG_APP3, "app3" }, - { LOG_ALL, "all" }, - { LOG_FLUSH, "flush" }, + { YLOG_FATAL, "fatal"}, + { YLOG_DEBUG, "debug"}, + { YLOG_WARN, "warn" }, + { YLOG_LOG, "log" }, + { YLOG_ERRNO, ""}, + { YLOG_MALLOC, "malloc"}, + { YLOG_APP, "app" }, + { YLOG_NOTIME, "notime" }, + { YLOG_APP2, "app2" }, + { YLOG_APP3, "app3" }, + { YLOG_ALL, "all" }, + { YLOG_FLUSH, "flush" }, + { YLOG_LOGLVL, "loglevel" }, { 0, "none" }, { 0, NULL } /* the rest will be filled in if the user defines dynamic modules*/ }; -static unsigned int next_log_bit = LOG_LAST_BIT<<1; /* first dynamic bit */ +static unsigned int next_log_bit = YLOG_LAST_BIT<<1; /* first dynamic bit */ static void init_mutex() { @@ -117,11 +118,11 @@ void yaz_log_init_file (const char *fname) init_mutex(); if (fname) { - strncpy(l_fname, fname, sizeof(l_fname)-1); - l_fname[sizeof(l_fname)-1] = '\0'; + strncpy(l_fname, fname, sizeof(l_fname)-1); + l_fname[sizeof(l_fname)-1] = '\0'; } else - l_fname[0] = '\0'; + l_fname[0] = '\0'; yaz_log_reopen(); } @@ -133,14 +134,20 @@ void yaz_log_reopen(void) if (!l_file) l_file = stderr; if (!*l_fname) - new_file = stderr; + new_file = stderr; else if (!(new_file = fopen(l_fname, "a"))) + { + new_file=l_file; + l_file=stderr; /* just to be sure we don't rotate logs and recurse */ + yaz_log(YLOG_WARN|YLOG_ERRNO,"Could not open log file '%s'",l_fname); + l_file=new_file; /* restore to old value, probably stderr as well */ return; + } if (l_file != stderr) { fclose (l_file); } - if (l_level & LOG_FLUSH) + if (l_level & YLOG_FLUSH) setvbuf(new_file, 0, _IONBF, 0); l_file = new_file; } @@ -156,6 +163,7 @@ static void rotate_log() newname[509] = '\0'; /* make sure it is terminated */ strcat(newname,".1"); #ifdef WIN32 + /* windows can't rename a file if it is open */ fclose(l_file); l_file = stderr; #endif @@ -166,18 +174,36 @@ static void rotate_log() void yaz_log_init_level (int level) { - if ( (l_level & LOG_FLUSH) != (level & LOG_FLUSH) ) + if (!mutex_init_flag) + init_mutex(); + if ( (l_level & YLOG_FLUSH) != (level & YLOG_FLUSH) ) { l_level = level; yaz_log_reopen(); /* make sure we set buffering right */ } else l_level = level; + if (l_level & YLOG_LOGLVL) + { /* dump the log level bits */ + char *bittype="Static "; + int i; + yaz_log(YLOG_LOGLVL,"Setting log level to %d = 0x%08x",l_level,l_level); + for (i = 0; mask_names[i].name; i++) + if (mask_names[i].mask && *mask_names[i].name) + if (strcmp(mask_names[i].name,"all")!=0) + { + yaz_log(YLOG_LOGLVL,"%s log bit %08x '%s' is %s", + bittype, mask_names[i].mask, mask_names[i].name, + (level & mask_names[i].mask)? "ON": "off"); + if (mask_names[i].mask>YLOG_LAST_BIT) + bittype="Dynamic"; + } + } } void yaz_log_init_prefix (const char *prefix) { if (prefix && *prefix) - sprintf(l_prefix, "%.511s ", prefix); + sprintf(l_prefix, "%.511s ", prefix); else *l_prefix = 0; } @@ -185,7 +211,7 @@ void yaz_log_init_prefix (const char *prefix) void yaz_log_init_prefix2 (const char *prefix) { if (prefix && *prefix) - sprintf(l_prefix2, "%.511s ", prefix); + sprintf(l_prefix2, "%.511s ", prefix); else *l_prefix2 = 0; } @@ -237,7 +263,7 @@ void yaz_log(int level, const char *fmt, ...) int flen; if (!(level & l_level)) - return; + return; if (!mutex_init_flag) init_mutex(); if (!l_file) @@ -254,15 +280,15 @@ void yaz_log(int level, const char *fmt, ...) *flags = '\0'; for (i = 0; level && mask_names[i].name; i++) - if ( mask_names[i].mask & level) - { - if (*mask_names[i].name && mask_names[i].mask && - mask_names[i].mask != LOG_ALL) + if ( mask_names[i].mask & level) + { + if (*mask_names[i].name && mask_names[i].mask && + mask_names[i].mask != YLOG_ALL) { - sprintf(flags + strlen(flags), "[%s]", mask_names[i].name); - level &= ~mask_names[i].mask; + sprintf(flags + strlen(flags), "[%s]", mask_names[i].name); + level &= ~mask_names[i].mask; } - } + } va_start(ap, fmt); #ifdef WIN32 _vsnprintf(buf, sizeof(buf)-1, fmt, ap); @@ -275,7 +301,7 @@ void yaz_log(int level, const char *fmt, ...) #endif #endif /* WIN32 */ - if (o_level & LOG_ERRNO) + if (o_level & YLOG_ERRNO) { strcat(buf, " ["); yaz_strerror(buf+strlen(buf), 2048); @@ -286,17 +312,17 @@ void yaz_log(int level, const char *fmt, ...) (*start_hook_func)(o_level, buf, start_hook_info); ti = time(0); tim = localtime(&ti); - if (l_level & LOG_NOTIME) - tbuf[0] = '\0'; + if (l_level & YLOG_NOTIME) + tbuf[0] = '\0'; else - strftime(tbuf, TIMEFORMAT_LEN-1, l_actual_format, tim); + strftime(tbuf, TIMEFORMAT_LEN-1, l_actual_format, tim); tbuf[TIMEFORMAT_LEN-1] = '\0'; fprintf(l_file, "%s %s%s %s%s\n", tbuf, l_prefix, flags, l_prefix2, buf); - if (l_level & (LOG_FLUSH|LOG_DEBUG) ) + if (l_level & (YLOG_FLUSH|YLOG_DEBUG) ) fflush(l_file); if (end_hook_func) - (*end_hook_func)(o_level, buf, end_hook_info); + (*end_hook_func)(o_level, buf, end_hook_info); } void yaz_log_time_format(const char *fmt) @@ -337,11 +363,13 @@ static char *clean_name(const char *name, int len, char *namebuf, int buflen) static int define_module_bit(const char *name) { int i; + if (!mutex_init_flag) + init_mutex(); for (i = 0; mask_names[i].name; i++) ; if ( (i>=MAX_MASK_NAMES) || (next_log_bit >= 1<<31 )) { - yaz_log(LOG_WARN,"No more log bits left, not logging '%s'", name); + yaz_log(YLOG_WARN,"No more log bits left, not logging '%s'", name); return 0; } mask_names[i].mask = next_log_bit; @@ -357,31 +385,45 @@ int yaz_log_module_level(const char *name) int i; char clean[255]; char *n = clean_name(name, strlen(name), clean, sizeof(clean)); + if (!mutex_init_flag) + init_mutex(); for (i = 0; mask_names[i].name; i++) if (0==strcmp(n,mask_names[i].name)) + { + yaz_log(YLOG_LOGLVL,"returning log bit 0x%x for '%s' %s", + mask_names[i].mask, n, + strcmp(n,name)?name:"" ); return mask_names[i].mask; + } + yaz_log(YLOG_LOGLVL,"returning NO log bit for '%s' %s", n, + strcmp(n,name)?name:"" ); return 0; } int yaz_log_mask_str (const char *str) { - return yaz_log_mask_str_x (str, LOG_DEFAULT_LEVEL); + return yaz_log_mask_str_x (str, YLOG_DEFAULT_LEVEL); } int yaz_log_mask_str_x (const char *str, int level) { const char *p; int i; - int found; char clean[255] = ""; char *n = clean; while (*str) { - found = 0; + int found = 0; + int negated = 0; for (p = str; *p && *p != ','; p++) ; - if (*str == '-' || isdigit(*str)) + if (*str=='-') + { + negated=1; + str++; + } + if (isdigit(*(unsigned char *) str)) { level = atoi (str); found = 1; @@ -390,14 +432,15 @@ int yaz_log_mask_str_x (const char *str, int level) { n = clean_name(str, p-str, clean, sizeof(clean)); for (i = 0; mask_names[i].name; i++) - /*if (strlen (mask_names[i].name) == (size_t) (p-str) && - memcmp (mask_names[i].name, str, p-str) == 0)*/ if (0==strcmp (mask_names[i].name,n)) { if (mask_names[i].mask) - level |= mask_names[i].mask; + if (negated) + level &= ~mask_names[i].mask; + else + level |= mask_names[i].mask; else - level = 0; + level = 0; /* 'none' clears them all */ found = 1; } } @@ -409,3 +452,11 @@ int yaz_log_mask_str_x (const char *str, int level) } return level; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +