yaz_log_time_format sets the format of the timestamp. See man 3 strftime

Calling with "old" sets to the old format "11:55:06-02/11"
Calling with NULL or "" sets to the new format "20041102-115719"
If not called at all, the old format is used, for backward compatibility

diff --git a/client/client.c b/client/client.c
index 0aad380..3a3cc7e 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: client.c,v 1.254 2004-11-01 21:19:08 adam Exp $
+ * $Id: client.c,v 1.255 2004-11-02 11:37:21 heikki Exp $
  */
 
 #include <stdio.h>
@@ -51,6 +51,7 @@
 #include <yaz/srw.h>
 #include <yaz/yaz-ccl.h>
 #include <yaz/cql.h>
+#include <yaz/log.h>
 
 #if HAVE_READLINE_READLINE_H
 #include <readline/readline.h>

diff --git a/include/yaz/log.h b/include/yaz/log.h
index 25b31d0..d6b0963 100644 (file)
--- a/include/yaz/log.h
+++ b/include/yaz/log.h
@@ -23,7 +23,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: log.h,v 1.13 2004-10-15 00:18:59 adam Exp $
+ * $Id: log.h,v 1.14 2004-11-02 11:37:21 heikki Exp $
  */
 
 /**
@@ -63,6 +63,14 @@ YAZ_EXPORT void yaz_log_init_file (const char *fname);
 YAZ_EXPORT void yaz_log_init_level (int level);
 YAZ_EXPORT void yaz_log_init_prefix (const char *prefix);
 YAZ_EXPORT void yaz_log_init_prefix2 (const char *prefix);
+/** 
+ * yaz_log_time_format sets the format of the timestamp. See man 3 strftime 
+ * Calling with "old" sets to the old format "11:55:06-02/11"
+ * Calling with NULL or "" sets to the new format "20041102-115719"
+ * If not called at all, the old format is used, for backward compatibility
+ *
+ * */
+YAZ_EXPORT void yaz_log_time_format(const char *fmt);
 
 YAZ_EXPORT void yaz_log(int level, const char *fmt, ...)
 #ifdef __GNUC__

diff --git a/src/log.c b/src/log.c
index 32e26d9..134ce98 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: log.c,v 1.2 2004-10-15 00:19:00 adam Exp $
+ * $Id: log.c,v 1.3 2004-11-02 11:37:21 heikki Exp $
  */
 
 /**
@@ -41,11 +41,17 @@ char *strerror(int n)
 
 #endif
 
+
 static int l_level = LOG_DEFAULT_LEVEL;
 static FILE *l_file = NULL;
 static char l_prefix[512] = "";
 static char l_prefix2[512] = "";
 static char l_fname[512] = "";
+static char l_old_default_format[]="%H:%M:%S-%d/%m";
+static char l_new_default_format[]="%Y%m%d-%H%M%S";
+#define TIMEFORMAT_LEN 50
+static char l_custom_format[TIMEFORMAT_LEN]="";
+static char *l_actual_format=l_old_default_format;
 
 static struct {
     int mask;
@@ -157,7 +163,7 @@ void yaz_log(int level, const char *fmt, ...)
     int i;
     time_t ti;
     struct tm *tim;
-    char tbuf[50]="";
+    char tbuf[TIMEFORMAT_LEN]="";
     int o_level = level;
 
     if (!(level & l_level))
@@ -198,14 +204,33 @@ void yaz_log(int level, const char *fmt, ...)
     if (l_level & LOG_NOTIME)
       tbuf[0]='\0';
     else
-      strftime(tbuf, 50, "%H:%M:%S-%d/%m: ", tim);
-    fprintf(l_file, "%s%s%s %s%s\n", tbuf, l_prefix, flags,
+      strftime(tbuf, TIMEFORMAT_LEN-1, l_actual_format, tim);
+    tbuf[TIMEFORMAT_LEN-1]='\0';
+    fprintf(l_file, "%s %s%s %s%s\n", tbuf, l_prefix, flags,
             l_prefix2, buf);
     fflush(l_file);
     if (end_hook_func)
        (*end_hook_func)(o_level, buf, end_hook_info);
 }
 
+void yaz_log_time_format(const char *fmt)
+{
+    if ( !fmt || !*fmt) 
+    { /* no format, default to new */
+        l_actual_format = l_new_default_format;
+        return; 
+    }
+    if (0==strcmp(fmt,"old"))
+    { /* force the old format */
+        l_actual_format = l_old_default_format;
+        return; 
+    }
+    /* else use custom format */
+    strncpy(l_custom_format, fmt, TIMEFORMAT_LEN-1);
+    l_custom_format[TIMEFORMAT_LEN-1]='\0';
+    l_actual_format = l_custom_format;
+}
+
 int yaz_log_mask_str (const char *str)
 {
     return yaz_log_mask_str_x (str, LOG_DEFAULT_LEVEL);

diff --git a/src/statserv.c b/src/statserv.c
index 817c031..063ac46 100644 (file)
--- a/src/statserv.c
+++ b/src/statserv.c
@@ -5,7 +5,7 @@
  * NT threaded server code by
  *   Chas Woodfield, Fretwell Downing Informatics.
  *
- * $Id: statserv.c,v 1.9 2004-10-15 00:19:01 adam Exp $
+ * $Id: statserv.c,v 1.10 2004-11-02 11:37:21 heikki Exp $
  */
 
 /**
@@ -426,8 +426,7 @@ static void listener(IOCHAN h, int event)
                sprintf(nbuf, "%s(%d)", me, getpid());
                yaz_log_init(control_block.loglevel, nbuf, 0);
                 /* ensure that bend_stop is not called when each child exits -
-                   only for the main process .. 
-                */
+                   only for the main process ..  */
                 control_block.bend_stop = 0;
            }
            else /* parent */