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
Added turbo marc data files (generated from marc format)
[yaz-moved-to-github.git]
/
test
/
tstlog.c
diff --git
a/test/tstlog.c
b/test/tstlog.c
index
f61070f
..
d4a83e5
100644
(file)
--- a/
test/tstlog.c
+++ b/
test/tstlog.c
@@
-1,14
+1,20
@@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: tstlog.c,v 1.6 2005-09-08 13:22:58 adam Exp $
- *
*/
#include <stdio.h>
*/
#include <stdio.h>
+#include <string.h>
#include <stdlib.h>
#include <yaz/options.h>
#include <yaz/log.h>
#include <stdlib.h>
#include <yaz/options.h>
#include <yaz/log.h>
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+void hook_func(int level, const char *msg, void *vp)
+{
+ fprintf(stderr, "[HOOK level=%d msg=%s]\n", level, msg);
+}
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
@@
-16,22
+22,29
@@
int main(int argc, char **argv)
int i, ret;
int level = YLOG_LOG;
int number = 1;
int i, ret;
int level = YLOG_LOG;
int number = 1;
+ unsigned int wait_between_log = 0;
- while ((ret = options("f:v:l:m:n:s:", argv, argc, &arg)) != -2)
+ while ((ret = options("f:p:v:l:m:n:r:w:Hh", argv, argc, &arg)) != -2)
{
switch (ret)
{
{
switch (ret)
{
- case 's':
+ case 'r':
yaz_log_init_max_size(atoi(arg));
break;
case 'f':
yaz_log_time_format(arg);
break;
yaz_log_init_max_size(atoi(arg));
break;
case 'f':
yaz_log_time_format(arg);
break;
+ case 'p':
+ yaz_log_init_prefix(arg);
+ break;
case 'v':
yaz_log_init_level(yaz_log_mask_str(arg));
break;
case 'l':
case 'v':
yaz_log_init_level(yaz_log_mask_str(arg));
break;
case 'l':
- yaz_log_init_file(arg);
+ if (!strcmp(arg, "@"))
+ yaz_log_init_file(0);
+ else
+ yaz_log_init_file(arg);
break;
case 'n':
number = atoi(arg);
break;
case 'n':
number = atoi(arg);
@@
-39,14
+52,26
@@
int main(int argc, char **argv)
case 'm':
level = yaz_log_module_level(arg);
break;
case 'm':
level = yaz_log_module_level(arg);
break;
+ case 'w':
+ wait_between_log = atoi(arg);
+ break;
+ case 'H':
+ yaz_log_set_handler(hook_func, 0);
+ break;
case 0:
for (i = 0; i<number; i++)
case 0:
for (i = 0; i<number; i++)
- yaz_log(level, "%s", arg);
+ {
+ yaz_log(level, "%d %s", i, arg);
+#if HAVE_UNISTD_H
+ if (wait_between_log)
+ sleep(wait_between_log);
+#endif
+ }
break;
break;
+ case 'h':
default:
default:
- fprintf(stderr, "tstlog. Bad option\n");
fprintf(stderr, "tstlog [-f logformat] [-v level] [-l file] "
fprintf(stderr, "tstlog [-f logformat] [-v level] [-l file] "
- "[-m module] msg ..\n");
+ "[-p prefix] [-m module] [-w sec] [-r max] [-n num] [-H] msg ..\n");
exit(1);
}
}
exit(1);
}
}
@@
-55,6
+80,7
@@
int main(int argc, char **argv)
/*
* 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