--- deliantra/server/common/logger.C	2006/08/27 16:15:11	1.2
+++ deliantra/server/common/logger.C	2007/04/27 19:53:05	1.12
@@ -1,82 +1,62 @@
 /*
- * static char *rcsid_loger_c =
- *   "$Id: logger.C,v 1.2 2006/08/27 16:15:11 root Exp $ ";
+ * CrossFire, A Multiplayer game
+ * 
+ * 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>
  */
 
-/*
-    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-devel@real-time.com
-*/
-
-
-#include <stdarg.h>
+#include <cstdarg>
 #include <global.h>
 #include <funcpoint.h>
 
-/*
- * Logs a message to stderr, or to file, and/or even to socket.
- * Or discards the message if it is of no importanse, and none have
- * asked to hear messages of that logLevel.
- *
- * See include/logger.h for possible logLevels.  Messages with llevInfo
- * and llevError are always printed, regardless of debug mode.
- */
-
-void LOG (LogLevel logLevel, const char *format, ...)
+void
+LOG (int flags, 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.
-		     */
+  int level = flags & 15;
+
+  if (level > settings.debug)
+    return;
+
+  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);
+  va_start (ap, format);
+  vsnprintf (buf, sizeof (buf), format, ap);
+  va_end (ap);
+
+  strncat (tbuf, msec, sizeof (tbuf));
+  strncat (tbuf, buf, sizeof (tbuf));
+
+  fputs (tbuf, logfile);
+  if (logfile != stderr)
+    fputs (tbuf, stderr);
 
-  buf[0] = '\0';
-  if (logLevel <= settings.debug)
-  {
-    vsnprintf(buf, sizeof (buf), format, ap);
-    strncat(tbuf, buf, 20460);
-#ifdef WIN32 /* ---win32 change log handling for win32 */
-	fputs(tbuf, logfile);    /* wrote to file or stdout */
-#ifdef DEBUG				/* if we have a debug version, we want see ALL output */
-		fflush(logfile);    /* so flush this! */
-#endif
-	if(logfile != stderr)   /* if was it a logfile wrote it to screen too */ 
-		fputs(tbuf, stderr); 
-#else
-    fputs(tbuf, logfile);
-#endif
-  }
-  if (!exiting && !trying_emergency_save &&
-      logLevel == llevError && ++nroferrors > MAX_ERRORS) {
-    exiting = 1;
-    if (!trying_emergency_save)
-      emergency_save(0);
-  }
-  va_end(ap);
+  if (flags & logBacktrace)
+    log_backtrace (tbuf);
 }