X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftstlog.c;h=04f978713fcb824dd1f57f9ba4c402a600ce028b;hp=0d7338e5f463c729f10b26e763d3060786a9ea8c;hb=69c2dee55aa204cab368989b8385eda8b83bf2e2;hpb=721b8849056eefbcec3965b9ae6eeb04b6580c9c

diff --git a/test/tstlog.c b/test/tstlog.c
index 0d7338e..04f9787 100644
--- a/test/tstlog.c
+++ b/test/tstlog.c
@@ -1,11 +1,9 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstlog.c,v 1.8 2005-09-16 21:14:38 adam Exp $
- *
  */
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <yaz/options.h>
 #include <yaz/log.h>
@@ -13,6 +11,11 @@
 #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;
@@ -21,21 +24,27 @@ int main(int argc, char **argv)
     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:p:v:l:m:n:r:w:Hh", argv, argc, &arg)) != -2)
     {
         switch (ret)
         {
-        case 's':
+        case 'r':
             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':
-            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);
@@ -46,6 +55,9 @@ int main(int argc, char **argv)
         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++)
             {
@@ -56,10 +68,10 @@ int main(int argc, char **argv)
 #endif
             }
             break;
+        case 'h':
         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");
+                    "[-p prefix] [-m module] [-w sec] [-r max] [-n num] [-H] msg ..\n");
             exit(1);
         }
     }
@@ -68,6 +80,7 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab