X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Flog.c;h=f459fb1dcee01c9a33814e861bffa9b4765c997c;hb=694d75cb1eaed143238ffc563414047dbfc77752;hp=6fd475d4b231cb608fd5be6a2ccec3e0305f0224;hpb=f4c095a042b1bcccb78136be87944e46412386aa;p=yaz-moved-to-github.git diff --git a/src/log.c b/src/log.c index 6fd475d..f459fb1 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.18 2004-12-13 14:21:55 heikki Exp $ + * $Id: log.c,v 1.27 2005-09-09 11:29:54 adam Exp $ */ /** @@ -75,7 +75,7 @@ static int l_max_size = 1024*1024*1024; static struct { int mask; char *name; -} mask_names[MAX_MASK_NAMES] = +} mask_names[MAX_MASK_NAMES] = { { YLOG_FATAL, "fatal"}, { YLOG_DEBUG, "debug"}, @@ -83,14 +83,14 @@ static struct { { YLOG_LOG, "log" }, { YLOG_ERRNO, ""}, { YLOG_MALLOC, "malloc"}, - /* { YLOG_APP, "app" }, */ + { YLOG_APP, "app" }, { YLOG_NOTIME, "notime" }, - /* { YLOG_APP2, "app2" }, */ - /* { YLOG_APP3, "app3" }, */ + { YLOG_APP2, "app2" }, + { YLOG_APP3, "app3" }, { YLOG_ALL, "all" }, { YLOG_FLUSH, "flush" }, { YLOG_LOGLVL, "loglevel" }, - { 0, "none" }, + { 0, "none" }, { 0, NULL } /* the rest will be filled in if the user defines dynamic modules*/ }; @@ -114,29 +114,33 @@ FILE *yaz_log_file(void) void yaz_log_init_file (const char *fname) { - if (!mutex_init_flag) - init_mutex(); + 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(); } void yaz_log_reopen(void) { FILE *new_file; - if (!mutex_init_flag) - init_mutex(); + init_mutex(); 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); @@ -160,14 +164,17 @@ static void rotate_log() /* windows can't rename a file if it is open */ fclose(l_file); l_file = stderr; -#endif + MoveFileEx(l_fname, newname, MOVEFILE_REPLACE_EXISTING); +#else rename(l_fname, newname); +#endif yaz_log_reopen(); } void yaz_log_init_level (int level) { + init_mutex(); if ( (l_level & YLOG_FLUSH) != (level & YLOG_FLUSH) ) { l_level = level; @@ -176,18 +183,26 @@ void yaz_log_init_level (int level) 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++) + const char *bittype = "Static "; + int i, sz; + + yaz_log(YLOG_LOGLVL, "Setting log level to %d = 0x%08x", + l_level, l_level); + /* determine size of mask_names (locked) */ + nmem_mutex_enter(log_mutex); + for (sz = 0; mask_names[sz].name; sz++) + ; + nmem_mutex_leave(log_mutex); + /* second pass without lock */ + for (i = 0; i < sz; i++) if (mask_names[i].mask && *mask_names[i].name) - if (strcmp(mask_names[i].name,"all")!=0) + 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"; + 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"; } } } @@ -195,7 +210,7 @@ void yaz_log_init_level (int level) 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; } @@ -203,15 +218,14 @@ 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; } void yaz_log_init(int level, const char *prefix, const char *fname) { - if (!mutex_init_flag) - init_mutex(); + init_mutex(); yaz_log_init_level (level); yaz_log_init_prefix (prefix); if (fname && *fname) @@ -255,32 +269,31 @@ void yaz_log(int level, const char *fmt, ...) int flen; if (!(level & l_level)) - return; - if (!mutex_init_flag) - init_mutex(); + return; + init_mutex(); + nmem_mutex_enter(log_mutex); if (!l_file) l_file = stderr; if ((l_file != stderr) && (l_max_size>0)) { - nmem_mutex_enter (log_mutex); flen = ftell(l_file); if (flen>l_max_size) rotate_log(); - nmem_mutex_leave (log_mutex); } *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 && + 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); @@ -305,16 +318,17 @@ void yaz_log(int level, const char *fmt, ...) ti = time(0); tim = localtime(&ti); if (l_level & YLOG_NOTIME) - tbuf[0] = '\0'; + 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 & (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); + nmem_mutex_leave(log_mutex); } void yaz_log_time_format(const char *fmt) @@ -340,8 +354,8 @@ static char *clean_name(const char *name, int len, char *namebuf, int buflen) { char *p = namebuf; char *start = namebuf; - if (buflen =MAX_MASK_NAMES) || (next_log_bit >= 1<<31 )) { - yaz_log(YLOG_WARN,"No more log bits left, not logging '%s'", name); + nmem_mutex_leave(log_mutex); + yaz_log(YLOG_WARN, "No more log bits left, not logging '%s'", name); return 0; } mask_names[i].mask = next_log_bit; next_log_bit = next_log_bit<<1; - mask_names[i].name = xstrdup(name); + mask_names[i].name = malloc (strlen(name)+1); + strcpy(mask_names[i].name, name); mask_names[i+1].name = NULL; mask_names[i+1].mask = 0; + nmem_mutex_leave(log_mutex); return mask_names[i].mask; } @@ -375,16 +397,21 @@ int yaz_log_module_level(const char *name) int i; char clean[255]; char *n = clean_name(name, strlen(name), clean, sizeof(clean)); + init_mutex(); + + nmem_mutex_enter(log_mutex); for (i = 0; mask_names[i].name; i++) - if (0==strcmp(n,mask_names[i].name)) + if (0==strcmp(n, mask_names[i].name)) { - yaz_log(YLOG_LOGLVL,"returning log bit 0x%x for '%s' %s", + nmem_mutex_leave(log_mutex); + yaz_log(YLOG_LOGLVL, "returning log bit 0x%x for '%s' %s", mask_names[i].mask, n, - strcmp(n,name)?name:"" ); + 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:"" ); + nmem_mutex_leave(log_mutex); + yaz_log(YLOG_LOGLVL, "returning NO log bit for '%s' %s", n, + strcmp(n, name) ? name : "" ); return 0; } @@ -396,49 +423,44 @@ int yaz_log_mask_str (const char *str) int yaz_log_mask_str_x (const char *str, int level) { const char *p; - int i; - int found; - int negated; - char clean[255] = ""; - char *n = clean; while (*str) { - found = 0; - negated=0; + int negated = 0; for (p = str; *p && *p != ','; p++) ; if (*str=='-') { - negated=1; + negated = 1; str++; } - if (isdigit(*str)) + if (isdigit(*(unsigned char *) str)) { - level = atoi (str); - found = 1; + level = atoi(str); } else { - n = clean_name(str, p-str, clean, sizeof(clean)); - for (i = 0; mask_names[i].name; i++) - if (0==strcmp (mask_names[i].name,n)) - { - if (mask_names[i].mask) - if (negated) - level &= ~mask_names[i].mask; - else - level |= mask_names[i].mask; - else - level = 0; /* 'none' clears them all */ - found = 1; - } + char clean[509]; + char *n = clean_name(str, p-str, clean, sizeof(clean)); + int mask = define_module_bit(n); + if (!mask) + level = 0; /* 'none' clears them all */ + else if (negated) + level &= ~mask; + else + level |= mask; } - if (!found) - level |= define_module_bit(n); if (*p == ',') p++; str = p; } return level; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +