--- deliantra/server/common/logger.C	2006/12/11 19:46:46	1.6
+++ deliantra/server/common/logger.C	2007/01/15 21:06:18	1.11
@@ -1,26 +1,26 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2002 Mark Wedel & Crossfire Development Team
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    The authors can be reached via e-mail at <crossfire@schmorp.de>
-*/
-
+ * 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
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ */
 
 #include <stdarg.h>
 #include <global.h>
@@ -38,33 +38,28 @@
 void
 LOG (LogLevel logLevel, const char *format, ...)
 {
-  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 tbuf[20480];
-
-  time_t curtime = time (NULL);
-  struct tm *ptime = localtime (&curtime);
+  if (logLevel <= settings.debug)
+    {
+      char msec[20];
+      char buf[20460];
+      char tbuf[20480];
+
+      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_list ap;
+      va_start (ap, format);
+      vsnprintf (buf, sizeof (buf), format, ap);
+      va_end (ap);
 
-  va_start (ap, format);
+      strncat (tbuf, msec, sizeof (tbuf));
+      strncat (tbuf, buf, sizeof (tbuf));
 
-  buf[0] = '\0';
-  if (logLevel <= settings.debug)
-    {
-      vsnprintf (buf, sizeof (buf), format, ap);
-      strncat (tbuf, buf, 20460);
       fputs (tbuf, logfile);
+      fputs (tbuf, stderr);
     }
-  if (!exiting && !trying_emergency_save && logLevel == llevError && ++nroferrors > MAX_ERRORS)
-    {
-      exiting = 1;
-      if (!trying_emergency_save)
-        emergency_save (0);
-    }
-  va_end (ap);
 }