X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Flog.c;h=b001c3158278c733cd11a88d15dd379733eb5bba;hp=855c749a2689039a0d36b0459d626d7655928ff8;hb=6f2f82e34ee173a0626432b57ebcbb8375e83a68;hpb=4ea32ed8aafed5ffecaeb5fe66ac9bb28f9dd180 diff --git a/src/log.c b/src/log.c index 855c749..b001c31 100644 --- a/src/log.c +++ b/src/log.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2007, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. - * - * $Id: log.c,v 1.54 2007-06-05 06:42:26 adam Exp $ */ /** @@ -16,9 +14,12 @@ #ifdef WIN32 #include +#include #endif +#if HAVE_SYS_STAT_H #include +#endif #include #include #include @@ -26,26 +27,12 @@ #include #include #include -#include +#include +#include #include #include #include -#define HAS_STRERROR 1 - - -#if HAS_STRERROR - -#else -char *strerror(int n) -{ - extern char *sys_errlist[]; - return sys_errlist[n]; -} - -#endif - - static int l_level = YLOG_DEFAULT_LEVEL; enum l_file_type { use_stderr, use_none, use_file }; @@ -69,14 +56,18 @@ static char l_fname[512] = ""; static char l_old_default_format[] = "%H:%M:%S-%d/%m"; static char l_new_default_format[] = "%Y%m%d-%H%M%S"; #define TIMEFORMAT_LEN 50 +#define TID_LEN 30 static char l_custom_format[TIMEFORMAT_LEN] = ""; static char *l_actual_format = l_old_default_format; -/** l_max_size tells when to rotate the log. Default is 1 GB - This is almost the same as never, but it saves applications in the - case of 2 or 4 GB file size limits.. +/** l_max_size tells when to rotate the log. The default value is + 0 which means DISABLED. This is to be preffered if YAZ runs + as a server using logrotate etc. + A positive size specifies the file size in bytes when a log rotate + will occur. Note that in order for this to work YAZ must have + permissions to do so. */ -static int l_max_size = 1024*1024*1024; +static int l_max_size = 0; #define MAX_MASK_NAMES 35 /* 32 bits plus a few combo names */ static struct { @@ -90,7 +81,8 @@ static struct { { YLOG_LOG, "log" }, { YLOG_ERRNO, ""}, { YLOG_MALLOC, "malloc"}, - { YLOG_APP, "app" }, + { YLOG_TID, "tid" }, + { YLOG_APP, "app" }, { YLOG_NOTIME, "notime" }, { YLOG_APP2, "app2" }, { YLOG_APP3, "app3" }, @@ -276,14 +268,14 @@ void yaz_log_set_handler(void (*func)(int, const char *, void *), void *info) void log_event_start(void (*func)(int, const char *, void *), void *info) { - start_hook_func = func; - start_hook_info = info; + start_hook_func = func; + start_hook_info = info; } void log_event_end(void (*func)(int, const char *, void *), void *info) { - end_hook_func = func; - end_hook_info = info; + end_hook_func = func; + end_hook_info = info; } static void yaz_log_open_check(struct tm *tm, int force, const char *filemode) @@ -294,7 +286,7 @@ static void yaz_log_open_check(struct tm *tm, int force, const char *filemode) if (yaz_file_type != use_file) return; - if (l_fname && *l_fname) + if (*l_fname) { strftime(new_filename, sizeof(new_filename)-1, l_fname, tm); if (strcmp(new_filename, cur_filename)) @@ -393,6 +385,7 @@ static void yaz_log_to_file(int level, const char *log_message) if (file) { char tbuf[TIMEFORMAT_LEN]; + char tid[TID_LEN]; char flags[1024]; int i; @@ -422,7 +415,16 @@ static void yaz_log_to_file(int level, const char *log_message) } if (tbuf[0]) strcat(tbuf, " "); - fprintf(file, "%s%s%s %s%s\n", tbuf, l_prefix, flags, l_prefix2, + tid[0] = '\0'; + + if (l_level & YLOG_TID) + { + yaz_thread_id_cstr(tid, sizeof(tid)-1); + if (tid[0]) + strcat(tid, " "); + } + + fprintf(file, "%s%s%s%s %s%s\n", tbuf, l_prefix, tid, flags, l_prefix2, log_message); if (l_level & YLOG_FLUSH) fflush(file); @@ -448,7 +450,7 @@ void yaz_log(int level, const char *fmt, ...) if (o_level & YLOG_ERRNO) { - int remain = sizeof(buf) - strlen(buf); + size_t remain = sizeof(buf) - strlen(buf); if (remain > 100) /* reasonable minimum space for error */ { strcat(buf, " ["); @@ -487,7 +489,7 @@ void yaz_log_time_format(const char *fmt) } /** cleans a loglevel name from leading paths and suffixes */ -static char *clean_name(const char *name, int len, char *namebuf, int buflen) +static char *clean_name(const char *name, size_t len, char *namebuf, size_t buflen) { char *p = namebuf; char *start = namebuf; @@ -504,19 +506,19 @@ static char *clean_name(const char *name, int len, char *namebuf, int buflen) static int define_module_bit(const char *name) { - int i; + size_t i; for (i = 0; mask_names[i].name; i++) if (0 == strcmp(mask_names[i].name, name)) { return mask_names[i].mask; } - if ( (i>=MAX_MASK_NAMES) || (next_log_bit & (1<<31) )) + if ( (i>=MAX_MASK_NAMES) || (next_log_bit & (1U<<31) )) { yaz_log(YLOG_WARN, "No more log bits left, not logging '%s'", name); return 0; } - mask_names[i].mask = next_log_bit; + mask_names[i].mask = (int) next_log_bit; /* next_log_bit can hold int */ next_log_bit = next_log_bit<<1; mask_names[i].name = (char *) malloc(strlen(name)+1); strcpy(mask_names[i].name, name); @@ -573,7 +575,7 @@ int yaz_log_mask_str_x(const char *str, int level) else { char clean[509]; - char *n = clean_name(str, p-str, clean, sizeof(clean)); + char *n = clean_name(str, (size_t) (p - str), clean, sizeof(clean)); int mask = define_module_bit(n); if (!mask) level = 0; /* 'none' clears them all */ @@ -591,7 +593,9 @@ int yaz_log_mask_str_x(const char *str, int level) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +