projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ZOOM: resultset size (hit count) is type Odr_int
[yaz-moved-to-github.git]
/
src
/
log.c
diff --git
a/src/log.c
b/src/log.c
index
a696fd3
..
97a07ba
100644
(file)
--- 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-2009 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: log.c,v 1.53 2007-06-05 06:23:07 adam Exp $
*/
/**
*/
/**
@@
-16,9
+14,12
@@
#ifdef WIN32
#include <windows.h>
#ifdef WIN32
#include <windows.h>
+#include <sys/stat.h>
#endif
#endif
+#if HAVE_SYS_STAT_H
#include <sys/stat.h>
#include <sys/stat.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@
-26,7
+27,7
@@
#include <stdarg.h>
#include <errno.h>
#include <time.h>
#include <stdarg.h>
#include <errno.h>
#include <time.h>
-#include <yaz/nmem.h>
+#include <yaz/errno.h>
#include <yaz/log.h>
#include <yaz/snprintf.h>
#include <yaz/xmalloc.h>
#include <yaz/log.h>
#include <yaz/snprintf.h>
#include <yaz/xmalloc.h>
@@
-72,11
+73,14
@@
static char l_new_default_format[] = "%Y%m%d-%H%M%S";
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 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 {
#define MAX_MASK_NAMES 35 /* 32 bits plus a few combo names */
static struct {
@@
-175,7
+179,7
@@
static void rotate_log(const char *cur_fname)
char fname_str[FILENAME_MAX];
struct stat stat_buf;
char fname_str[FILENAME_MAX];
struct stat stat_buf;
- sprintf(fname_str, "%s.%d", cur_fname, i);
+ yaz_snprintf(fname_str, sizeof(fname_str), "%s.%d", cur_fname, i);
if (stat(fname_str, &stat_buf) != 0)
break;
}
if (stat(fname_str, &stat_buf) != 0)
break;
}
@@
-184,10
+188,13
@@
static void rotate_log(const char *cur_fname)
char fname_str[2][FILENAME_MAX];
if (i > 0)
char fname_str[2][FILENAME_MAX];
if (i > 0)
- sprintf(fname_str[0], "%s.%d", cur_fname, i-1);
+ yaz_snprintf(fname_str[0], sizeof(fname_str[0]),
+ "%s.%d", cur_fname, i-1);
else
else
- sprintf(fname_str[0], "%s", cur_fname);
- sprintf(fname_str[1], "%s.%d", cur_fname, i);
+ yaz_snprintf(fname_str[0], sizeof(fname_str[0]),
+ "%s", cur_fname);
+ yaz_snprintf(fname_str[1], sizeof(fname_str[1]),
+ "%s.%d", cur_fname, i);
#ifdef WIN32
MoveFileEx(fname_str[0], fname_str[1], MOVEFILE_REPLACE_EXISTING);
#else
#ifdef WIN32
MoveFileEx(fname_str[0], fname_str[1], MOVEFILE_REPLACE_EXISTING);
#else
@@
-291,7
+298,7
@@
static void yaz_log_open_check(struct tm *tm, int force, const char *filemode)
if (yaz_file_type != use_file)
return;
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))
{
strftime(new_filename, sizeof(new_filename)-1, l_fname, tm);
if (strcmp(new_filename, cur_filename))
@@
-400,7
+407,13
@@
static void yaz_log_to_file(int level, const char *log_message)
if (*mask_names[i].name && mask_names[i].mask &&
mask_names[i].mask != YLOG_ALL)
{
if (*mask_names[i].name && mask_names[i].mask &&
mask_names[i].mask != YLOG_ALL)
{
- sprintf(flags + strlen(flags), "[%s]", mask_names[i].name);
+ if (strlen(flags) + strlen(mask_names[i].name)
+ < sizeof(flags) - 4)
+ {
+ strcat(flags, "[");
+ strcat(flags, mask_names[i].name);
+ strcat(flags, "]");
+ }
level &= ~mask_names[i].mask;
}
}
level &= ~mask_names[i].mask;
}
}
@@
-582,7
+595,9
@@
int yaz_log_mask_str_x(const char *str, int level)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+