ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/logger.C
(Generate patch)

Comparing deliantra/server/common/logger.C (file contents):
Revision 1.2 by root, Sun Aug 27 16:15:11 2006 UTC vs.
Revision 1.9 by root, Sun Jan 7 23:10:42 2007 UTC

1/*
2 * static char *rcsid_loger_c =
3 * "$Id: logger.C,v 1.2 2006/08/27 16:15:11 root Exp $ ";
4 */
5
6/* 1/*
7 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
8 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
11 7
12 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
13 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
21 17
22 You should have received a copy of the GNU General Public License 18 You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software 19 along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 21
26 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 The authors can be reached via e-mail at <crossfire@schmorp.de>
27*/ 23*/
28 24
29 25
30#include <stdarg.h> 26#include <stdarg.h>
31#include <global.h> 27#include <global.h>
38 * 34 *
39 * See include/logger.h for possible logLevels. Messages with llevInfo 35 * See include/logger.h for possible logLevels. Messages with llevInfo
40 * and llevError are always printed, regardless of debug mode. 36 * and llevError are always printed, regardless of debug mode.
41 */ 37 */
42 38
39void
43void LOG (LogLevel logLevel, const char *format, ...) 40LOG (LogLevel logLevel, const char *format, ...)
44{ 41{
42 if (logLevel <= settings.debug)
43 {
45 char buf[20480]; /* This needs to be really really big - larger 44 char buf[20480]; /* This needs to be really really big - larger
46 * than any other buffer, since that buffer may 45 * than any other buffer, since that buffer may
47 * need to be put in this one. 46 * need to be put in this one.
48 */ 47 */
48 char msec[20];
49 char tbuf[20480]; 49 char tbuf[80];
50 50
51 time_t curtime = time (NULL); 51 struct timeval tv;
52 gettimeofday (&tv, 0);
52 struct tm *ptime = localtime (&curtime); 53 struct tm *ptime = localtime (&tv.tv_sec);
53 54
54 strftime (tbuf, 256, "%Y-%m-%d %H:%M:%S ", ptime); 55 strftime (tbuf, sizeof (tbuf), "%Y-%m-%d %H:%M:%S", ptime);
56 sprintf (msec, ".%03d ", (int)(tv.tv_usec / 1000));
55 57
56 va_list ap; 58 va_list ap;
57 va_start(ap, format); 59 va_start (ap, format);
60 vsnprintf (buf, sizeof (buf), format, ap);
61 va_end (ap);
58 62
59 buf[0] = '\0'; 63 strncat (tbuf, msec, sizeof (buf));
60 if (logLevel <= settings.debug) 64 strncat (tbuf, buf, sizeof (buf));
61 { 65
62 vsnprintf(buf, sizeof (buf), format, ap);
63 strncat(tbuf, buf, 20460);
64#ifdef WIN32 /* ---win32 change log handling for win32 */
65 fputs(tbuf, logfile); /* wrote to file or stdout */
66#ifdef DEBUG /* if we have a debug version, we want see ALL output */
67 fflush(logfile); /* so flush this! */
68#endif
69 if(logfile != stderr) /* if was it a logfile wrote it to screen too */
70 fputs(tbuf, stderr);
71#else
72 fputs(tbuf, logfile); 66 fputs (tbuf, logfile);
73#endif 67 fputs (tbuf, stderr);
74 } 68 }
75 if (!exiting && !trying_emergency_save &&
76 logLevel == llevError && ++nroferrors > MAX_ERRORS) {
77 exiting = 1;
78 if (!trying_emergency_save)
79 emergency_save(0);
80 }
81 va_end(ap);
82} 69}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines