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
Add support for privately defined extended service, xml update, with
[yaz-moved-to-github.git]
/
src
/
log.c
diff --git
a/src/log.c
b/src/log.c
index
f6690e5
..
54753f0
100644
(file)
--- a/
src/log.c
+++ b/
src/log.c
@@
-1,8
+1,8
@@
/*
/*
- * Copyright (c) 1995-2004, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: log.c,v 1.16 2004-11-18 15:18:13 heikki Exp $
+ * $Id: log.c,v 1.24 2005-05-18 12:30:00 adam Exp $
*/
/**
*/
/**
@@
-34,7
+34,8
@@
#include <errno.h>
#include <time.h>
#include <yaz/nmem.h>
#include <errno.h>
#include <time.h>
#include <yaz/nmem.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
+#include <yaz/xmalloc.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 */
@@
-82,10
+83,10
@@
static struct {
{ YLOG_LOG, "log" },
{ YLOG_ERRNO, ""},
{ YLOG_MALLOC, "malloc"},
{ YLOG_LOG, "log" },
{ YLOG_ERRNO, ""},
{ YLOG_MALLOC, "malloc"},
- /* { YLOG_APP, "app" }, */
- { YLOG_NOTIME, "" },
- /* { YLOG_APP2, "app2" }, */
- /* { YLOG_APP3, "app3" }, */
+ { YLOG_APP, "app" },
+ { YLOG_NOTIME, "notime" },
+ { YLOG_APP2, "app2" },
+ { YLOG_APP3, "app3" },
{ YLOG_ALL, "all" },
{ YLOG_FLUSH, "flush" },
{ YLOG_LOGLVL, "loglevel" },
{ YLOG_ALL, "all" },
{ YLOG_FLUSH, "flush" },
{ YLOG_LOGLVL, "loglevel" },
@@
-135,7
+136,13
@@
void yaz_log_reopen(void)
if (!*l_fname)
new_file = stderr;
else if (!(new_file = fopen(l_fname, "a")))
if (!*l_fname)
new_file = stderr;
else if (!(new_file = fopen(l_fname, "a")))
+ {
+ new_file=l_file;
+ l_file=stderr; /* just to be sure we don't rotate logs and recurse */
+ yaz_log(YLOG_WARN|YLOG_ERRNO,"Could not open log file '%s'",l_fname);
+ l_file=new_file; /* restore to old value, probably stderr as well */
return;
return;
+ }
if (l_file != stderr)
{
fclose (l_file);
if (l_file != stderr)
{
fclose (l_file);
@@
-167,6
+174,8
@@
static void rotate_log()
void yaz_log_init_level (int level)
{
void yaz_log_init_level (int level)
{
+ if (!mutex_init_flag)
+ init_mutex();
if ( (l_level & YLOG_FLUSH) != (level & YLOG_FLUSH) )
{
l_level = level;
if ( (l_level & YLOG_FLUSH) != (level & YLOG_FLUSH) )
{
l_level = level;
@@
-354,6
+363,8
@@
static char *clean_name(const char *name, int len, char *namebuf, int buflen)
static int define_module_bit(const char *name)
{
int i;
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 ))
for (i = 0; mask_names[i].name; i++)
;
if ( (i>=MAX_MASK_NAMES) || (next_log_bit >= 1<<31 ))
@@
-374,6
+385,8
@@
int yaz_log_module_level(const char *name)
int i;
char clean[255];
char *n = clean_name(name, strlen(name), clean, sizeof(clean));
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))
{
for (i = 0; mask_names[i].name; i++)
if (0==strcmp(n,mask_names[i].name))
{
@@
-396,15
+409,13
@@
int yaz_log_mask_str_x (const char *str, int level)
{
const char *p;
int i;
{
const char *p;
int i;
- int found;
- int negated;
char clean[255] = "";
char *n = clean;
while (*str)
{
char clean[255] = "";
char *n = clean;
while (*str)
{
- found = 0;
- negated=0;
+ int found = 0;
+ int negated = 0;
for (p = str; *p && *p != ','; p++)
;
if (*str=='-')
for (p = str; *p && *p != ','; p++)
;
if (*str=='-')
@@
-412,7
+423,7
@@
int yaz_log_mask_str_x (const char *str, int level)
negated=1;
str++;
}
negated=1;
str++;
}
- if (isdigit(*str))
+ if (isdigit(*(unsigned char *) str))
{
level = atoi (str);
found = 1;
{
level = atoi (str);
found = 1;