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.11 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.16 by root, Thu Nov 8 19:43:23 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * 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
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <stdarg.h> 24#include <cstdarg>
26#include <global.h> 25#include <global.h>
27#include <funcpoint.h> 26#include <funcpoint.h>
28 27
29/* 28void
30 * Logs a message to stderr, or to file, and/or even to socket. 29LOG (int flags, const char *format, ...)
31 * Or discards the message if it is of no importanse, and none have 30{
32 * asked to hear messages of that logLevel. 31 int level = flags & 15;
33 *
34 * See include/logger.h for possible logLevels. Messages with llevInfo
35 * and llevError are always printed, regardless of debug mode.
36 */
37 32
38void
39LOG (LogLevel logLevel, const char *format, ...)
40{
41 if (logLevel <= settings.debug) 33 if (level > settings.debug)
42 { 34 return;
43 char msec[20];
44 char buf[20460];
45 char tbuf[20480];
46 35
47 struct timeval tv; 36 char buf[20480];
48 gettimeofday (&tv, 0);
49 struct tm *ptime = localtime (&tv.tv_sec);
50 37
51 strftime (tbuf, sizeof (tbuf), "%Y-%m-%d %H:%M:%S", ptime); 38 struct timeval tv;
52 sprintf (msec, ".%03d ", (int)(tv.tv_usec / 1000)); 39 gettimeofday (&tv, 0);
40 struct tm *ptime = localtime (&tv.tv_sec);
53 41
54 va_list ap; 42 int len = strftime (buf, sizeof (buf) - 7, "%Y-%m-%d %H:%M:%S", ptime);
55 va_start (ap, format); 43 len += sprintf (buf + len, ".%04d ", (int)(tv.tv_usec / 100));
56 vsnprintf (buf, sizeof (buf), format, ap);
57 va_end (ap);
58 44
59 strncat (tbuf, msec, sizeof (tbuf)); 45 va_list ap;
60 strncat (tbuf, buf, sizeof (tbuf)); 46 va_start (ap, format);
47 len += vsnprintf (buf + len, sizeof (buf) - len, format, ap);
48 va_end (ap);
61 49
62 fputs (tbuf, logfile); 50 len = min (sizeof (buf) - 1, len);
63 fputs (tbuf, stderr); 51
64 } 52 if (buf [len - 1] != '\n')
53 buf [len++] = '\n'; // not 0-terminated
54
55 write (STDERR_FILENO, buf, len);
56 if (logfile != stderr)
57 fwrite (buf, 1, len, logfile);
58
59 if (flags & logBacktrace)
60 log_backtrace (buf);
65} 61}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines