--- deliantra/server/common/logger.C	2006/12/30 10:16:10	1.7
+++ deliantra/server/common/logger.C	2007/01/08 23:36:15	1.10
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -21,7 +22,6 @@
     The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 
-
 #include <stdarg.h>
 #include <global.h>
 #include <funcpoint.h>
@@ -40,26 +40,26 @@
 {
   if (logLevel <= settings.debug)
     {
-      char buf[20480];              /* This needs to be really really big - larger
-                                     * than any other buffer, since that buffer may
-                                     * need to be put in this one.
-                                     */
+      char msec[20];
+      char buf[20460];
       char tbuf[20480];
 
-      time_t curtime = time (NULL);
-      struct tm *ptime = localtime (&curtime);
+      struct timeval tv;
+      gettimeofday (&tv, 0);
+      struct tm *ptime = localtime (&tv.tv_sec);
 
-      strftime (tbuf, 256, "%Y-%m-%d %H:%M:%S ", ptime);
+      strftime (tbuf, sizeof (tbuf), "%Y-%m-%d %H:%M:%S", ptime);
+      sprintf (msec, ".%03d ", (int)(tv.tv_usec / 1000));
 
       va_list ap;
-
       va_start (ap, format);
-
       vsnprintf (buf, sizeof (buf), format, ap);
-      strncat (tbuf, buf, 20460);
+      va_end (ap);
+
+      strncat (tbuf, msec, sizeof (tbuf));
+      strncat (tbuf, buf, sizeof (tbuf));
+
       fputs (tbuf, logfile);
       fputs (tbuf, stderr);
-
-      va_end (ap);
     }
 }