/*
- * Copyright (c) 1995-2004, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: log.c,v 1.20 2005-01-07 10:28:28 heikki Exp $
+ * $Id: log.c,v 1.25 2005-06-25 15:46:04 adam Exp $
*/
/**
{ 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" },
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();
}
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;
void yaz_log_init_level (int level)
{
+ if (!mutex_init_flag)
+ init_mutex();
if ( (l_level & YLOG_FLUSH) != (level & YLOG_FLUSH) )
{
l_level = 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;
}
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;
}
int flen;
if (!(level & l_level))
- return;
+ return;
if (!mutex_init_flag)
init_mutex();
if (!l_file)
*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);
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);
}
void yaz_log_time_format(const char *fmt)
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 ))
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))
{
}
return level;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+