* Copyright (c) 1995-2004, Index Data
* See the file LICENSE for details.
*
- * $Id: log.c,v 1.10 2004-11-03 17:52:53 heikki Exp $
+ * $Id: log.c,v 1.14 2004-11-16 17:08:11 heikki Exp $
*/
/**
#include <time.h>
#include <yaz/nmem.h>
#include <yaz/log.h>
-#include <yaz/nmem.h>
-static NMEM_MUTEX log_mutex=0;
-static int mutex_init_flag=0; /* not yet initialized */
+static NMEM_MUTEX log_mutex = 0;
+static int mutex_init_flag = 0; /* not yet initialized */
#define HAS_STRERROR 1
#else
char *strerror(int n)
{
- extern char *sys_errlist[];
- return sys_errlist[n];
+ extern char *sys_errlist[];
+ return sys_errlist[n];
}
#endif
static char l_prefix2[512] = "";
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";
+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
-static char l_custom_format[TIMEFORMAT_LEN]="";
-static char *l_actual_format=l_old_default_format;
+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 to 1 GB */
-static const int l_def_max_size=1024*1024*1024;
-static int l_max_size=1024*1024*1024;
+static const int l_def_max_size = 1024*1024*1024;
+static int l_max_size = 1024*1024*1024;
#define MAX_MASK_NAMES 35 /* 32 bits plus a few combo names */
static struct {
{ LOG_APP3, "app3" },
{ LOG_ALL, "all" },
{ LOG_FLUSH, "flush" },
+ { LOG_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 = LOG_LAST_BIT<<1; /* first dynamic bit */
static void init_mutex()
{
if (mutex_init_flag)
return;
nmem_mutex_create (&log_mutex);
- mutex_init_flag=1;
+ mutex_init_flag = 1;
}
if (!l_file)
l_file = stderr;
if (!*l_fname)
- new_file=stderr;
+ new_file = stderr;
else if (!(new_file = fopen(l_fname, "a")))
return;
if (l_file != stderr)
return; /* can't rotate that */
if (!*l_fname)
return; /* hmm, no name, can't rotate */
- strncpy(newname, l_fname, 510);
- newname[510]='\0'; /* make sure it is terminated */
+ strncpy(newname, l_fname, 509);
+ 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;
+ l_file = stderr;
#endif
rename(l_fname, newname);
yaz_log_reopen();
yaz_log_reopen(); /* make sure we set buffering right */
} else
l_level = level;
+ if (l_level & LOG_LOGLVL)
+ { /* dump the log level bits */
+ char *bittype="Static ";
+ int i;
+ yaz_log(LOG_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(LOG_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>LOG_LAST_BIT)
+ bittype="Dynamic";
+ }
+ }
}
void yaz_log_init_prefix (const char *prefix)
void yaz_log_init_max_size(int mx)
{
if (mx <0)
- l_max_size=l_def_max_size;
+ l_max_size = l_def_max_size;
else
- l_max_size=mx;
+ l_max_size = mx;
}
static void (*start_hook_func)(int, const char *, void *) = NULL;
int i;
time_t ti;
struct tm *tim;
- char tbuf[TIMEFORMAT_LEN]="";
+ char tbuf[TIMEFORMAT_LEN] = "";
int o_level = level;
int flen;
if ((l_file != stderr) && (l_max_size>0))
{
nmem_mutex_enter (log_mutex);
- flen=ftell(l_file);
+ flen = ftell(l_file);
if (flen>l_max_size)
rotate_log();
nmem_mutex_leave (log_mutex);
{
if (*mask_names[i].name && mask_names[i].mask &&
mask_names[i].mask != LOG_ALL)
+ {
sprintf(flags + strlen(flags), "[%s]", mask_names[i].name);
- level -= mask_names[i].mask;
+ level &= ~mask_names[i].mask;
+ }
}
va_start(ap, fmt);
#ifdef WIN32
ti = time(0);
tim = localtime(&ti);
if (l_level & LOG_NOTIME)
- tbuf[0]='\0';
+ tbuf[0] = '\0';
else
- strftime(tbuf, TIMEFORMAT_LEN-1, l_actual_format, tim);
- tbuf[TIMEFORMAT_LEN-1]='\0';
+ 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) )
}
/* else use custom format */
strncpy(l_custom_format, fmt, TIMEFORMAT_LEN-1);
- l_custom_format[TIMEFORMAT_LEN-1]='\0';
+ l_custom_format[TIMEFORMAT_LEN-1] = '\0';
l_actual_format = l_custom_format;
}
/** cleans a loglevel name from leading paths and suffixes */
static char *clean_name(const char *name, int len, char *namebuf, int buflen)
{
- char *p;
- char *start;
+ char *p = namebuf;
+ char *start = namebuf;
if (buflen <len)
- len=buflen;
+ len = buflen;
strncpy(namebuf, name, len);
- namebuf[len]='\0';
- start=namebuf;
- p=namebuf;
- while ((p=index(start,'/')))
- start=p+1;
- if ((p=rindex(start,'.')))
- *p='\0';
- /*logf(LOG_LOG,"cleaned '%.*s' to '%s' ", len,name, start); */
+ namebuf[len] = '\0';
+ while ((p = strchr(start,'/')))
+ start = p+1;
+ if ((p = strrchr(start,'.')))
+ *p = '\0';
return start;
}
static int define_module_bit(const char *name)
{
int i;
- for (i=0;mask_names[i].name;i++)
+ 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);
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+1].name=NULL;
- mask_names[i+1].mask=0;
+ mask_names[i].mask = next_log_bit;
+ next_log_bit = next_log_bit<<1;
+ mask_names[i].name = xstrdup(name);
+ mask_names[i+1].name = NULL;
+ mask_names[i+1].mask = 0;
return mask_names[i].mask;
}
{
int i;
char clean[255];
- char *n=clean_name(name, strlen(name), clean, sizeof(clean));
- for (i=0;mask_names[i].name;i++)
+ char *n = clean_name(name, strlen(name), clean, sizeof(clean));
+ for (i = 0; mask_names[i].name; i++)
if (0==strcmp(n,mask_names[i].name))
+ {
+ yaz_log(LOG_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(LOG_LOGLVL,"returning NO log bit for '%s' %s", n,
+ strcmp(n,name)?name:"" );
return 0;
}
const char *p;
int i;
int found;
- char clean[255]="";
- char *n=clean;
+ char clean[255] = "";
+ char *n = clean;
while (*str)
{
- found=0;
+ found = 0;
for (p = str; *p && *p != ','; p++)
;
if (*str == '-' || isdigit(*str))
{
level = atoi (str);
- found=1;
+ found = 1;
}
else
{
- n=clean_name(str, p-str, clean, sizeof(clean));
+ 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;
else
- level = 0;
- found=1;
+ level = 0; /* 'none' clears them all */
+ found = 1;
}
}
if (!found)
projects / yaz-moved-to-github.git / blobdiff