--- deliantra/server/common/logger.C 2006/09/14 22:33:59 1.5 +++ deliantra/server/common/logger.C 2006/12/30 10:16:10 1.7 @@ -38,42 +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]; + 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 tbuf[20480]; - time_t curtime = time (NULL); - struct tm *ptime = localtime (&curtime); + time_t curtime = time (NULL); + struct tm *ptime = localtime (&curtime); - strftime (tbuf, 256, "%Y-%m-%d %H:%M:%S ", ptime); + strftime (tbuf, 256, "%Y-%m-%d %H:%M:%S ", ptime); - va_list ap; + va_list ap; - va_start (ap, format); + va_start (ap, format); - 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); + fputs (tbuf, stderr); + + va_end (ap); } - va_end (ap); }