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
marc8 test records in dist
[yaz-moved-to-github.git]
/
test
/
tstlog.c
diff --git
a/test/tstlog.c
b/test/tstlog.c
index
0d7338e
..
5364b63
100644
(file)
--- a/
test/tstlog.c
+++ b/
test/tstlog.c
@@
-1,11
+1,12
@@
/*
/*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: tstlog.c,v 1.8 2005-09-16 21:14:38 adam Exp $
+ * $Id: tstlog.c,v 1.12 2007-01-03 08:42:16 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>
@@
-13,6
+14,11
@@
#include <unistd.h>
#endif
#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)
{
char *arg;
int main(int argc, char **argv)
{
char *arg;
@@
-21,11
+27,11
@@
int main(int argc, char **argv)
int number = 1;
unsigned int wait_between_log = 0;
int number = 1;
unsigned int wait_between_log = 0;
- while ((ret = options("f:v:l:m:n:s:w:", argv, argc, &arg)) != -2)
+ while ((ret = options("f: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_init_max_size(atoi(arg));
break;
case 'f':
@@
-35,7
+41,10
@@
int main(int argc, char **argv)
yaz_log_init_level(yaz_log_mask_str(arg));
break;
case 'l':
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);
@@
-46,6
+55,9
@@
int main(int argc, char **argv)
case 'w':
wait_between_log = atoi(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++)
{
@@
-56,10
+68,11
@@
int main(int argc, char **argv)
#endif
}
break;
#endif
}
break;
+ case 'h':
default:
fprintf(stderr, "tstlog. Bad option\n");
fprintf(stderr, "tstlog [-f logformat] [-v level] [-l file] "
default:
fprintf(stderr, "tstlog. Bad option\n");
fprintf(stderr, "tstlog [-f logformat] [-v level] [-l file] "
- "[-m module] [-w sec] [-s max] [-n num] msg ..\n");
+ "[-m module] [-w sec] [-r max] [-n num] [-H] msg ..\n");
exit(1);
}
}
exit(1);
}
}