/*
- * Copyright (c) 1995-2003, Index Data
+ * Copyright (c) 1995-2004, Index Data
* See the file LICENSE for details.
*
- * $Id: log.c,v 1.1 2003-10-27 12:21:30 adam Exp $
+ * $Id: log.c,v 1.6 2004-11-02 13:52:54 heikki Exp $
+ */
+
+/**
+ * \file log.c
+ * \brief Implements logging utility
*/
#if HAVE_CONFIG_H
#endif
+
static int l_level = LOG_DEFAULT_LEVEL;
static FILE *l_file = NULL;
static char l_prefix[512] = "";
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";
+#define TIMEFORMAT_LEN 50
+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 int l_max_size=1024*1024*1024; */
+
static struct {
int mask;
char *name;
{ LOG_APP2 , "app2" },
{ LOG_APP3 , "app3" },
{ LOG_ALL, "all" },
+ { LOG_FLUSH, "flush" },
{ 0, "none" },
{ 0, NULL }
};
{
fclose (l_file);
}
- setvbuf(new_file, 0, _IONBF, 0);
+ if (l_level & LOG_FLUSH)
+ setvbuf(new_file, 0, _IONBF, 0);
l_file = new_file;
}
void yaz_log_init_level (int level)
{
- l_level = level;
+ if ( (l_level & LOG_FLUSH) != (level & LOG_FLUSH) )
+ {
+ l_level = level;
+ yaz_log_reopen(); /* make sure we set buffering right */
+ } else
+ l_level = level;
}
void yaz_log_init_prefix (const char *prefix)
int i;
time_t ti;
struct tm *tim;
- char tbuf[50]="";
+ char tbuf[TIMEFORMAT_LEN]="";
int o_level = level;
+ /* int flen; */
if (!(level & l_level))
return;
if (!l_file)
l_file = stderr;
+
+/*
+ flen=ftell(l_file);
+ if (flen>l_max_size)
+ rotate_log();
+*/
*flags = '\0';
for (i = 0; level && mask_names[i].name; i++)
if (mask_names[i].mask & level)
if (l_level & LOG_NOTIME)
tbuf[0]='\0';
else
- strftime(tbuf, 50, "%H:%M:%S-%d/%m: ", tim);
- fprintf(l_file, "%s%s%s %s%s\n", tbuf, l_prefix, flags,
+ 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);
- fflush(l_file);
+ if (l_level & (LOG_FLUSH|LOG_DEBUG) )
+ fflush(l_file);
if (end_hook_func)
(*end_hook_func)(o_level, buf, end_hook_info);
}
+void yaz_log_time_format(const char *fmt)
+{
+ if ( !fmt || !*fmt)
+ { /* no format, default to new */
+ l_actual_format = l_new_default_format;
+ return;
+ }
+ if (0==strcmp(fmt,"old"))
+ { /* force the old format */
+ l_actual_format = l_old_default_format;
+ return;
+ }
+ /* else use custom format */
+ strncpy(l_custom_format, fmt, TIMEFORMAT_LEN-1);
+ l_custom_format[TIMEFORMAT_LEN-1]='\0';
+ l_actual_format = l_custom_format;
+}
+
int yaz_log_mask_str (const char *str)
{
return yaz_log_mask_str_x (str, LOG_DEFAULT_LEVEL);