- *flags = '\0';
- for (i = 0; level && mask_names[i].name; i++)
- if ( mask_names[i].mask & level)
- {
- if (*mask_names[i].name && mask_names[i].mask &&
- mask_names[i].mask != LOG_ALL)
+
+static void yaz_strftime(char *dst, size_t sz,
+ const char *fmt, const struct tm *tm)
+{
+ const char *cp = strstr(fmt, "%!");
+ if (cp && strlen(fmt) < 60)
+ {
+ char fmt2[80];
+ char tpidstr[20];
+#ifdef WIN32
+ DWORD tid = GetCurrentThreadId();
+#else
+ long tid = 0;
+#if YAZ_POSIX_THREADS
+ tid = pthread_self();
+#endif
+#endif
+ memcpy(fmt2, fmt, cp-fmt);
+ fmt2[cp-fmt] = '\0';
+ sprintf(tpidstr, "%08lx", (long) tid);
+ strcat(fmt2, tpidstr);
+ strcat(fmt2, cp+2);
+ strftime(dst, sz, fmt2, tm);
+ }
+ else
+ strftime(dst, sz, fmt, tm);
+}
+
+static void yaz_log_to_file(int level, const char *log_message)
+{
+ FILE *file;
+ time_t ti = time(0);
+#if HAVE_LOCALTIME_R
+ struct tm tm0, *tm = &tm0;
+#else
+ struct tm *tm;
+#endif
+
+ internal_log_init();
+
+ nmem_mutex_enter(log_mutex);
+
+#if HAVE_LOCALTIME_R
+ localtime_r(&ti, tm);
+#else
+ tm = localtime(&ti);
+#endif
+
+ yaz_log_open_check(tm, 0, "a");
+ file = yaz_log_file(); /* file may change in yaz_log_open_check */
+
+ if (file)
+ {
+ char tbuf[TIMEFORMAT_LEN];
+ char flags[1024];
+ int i;
+
+ *flags = '\0';
+ for (i = 0; level && mask_names[i].name; i++)
+ if ( mask_names[i].mask & level)