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.12 by root, Fri Apr 27 19:53:05 2007 UTC vs.
Revision 1.14 by root, Sat Jun 9 23:18:17 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * 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 along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <cstdarg> 25#include <cstdarg>
26#include <global.h> 26#include <global.h>
27#include <funcpoint.h> 27#include <funcpoint.h>
32 int level = flags & 15; 32 int level = flags & 15;
33 33
34 if (level > settings.debug) 34 if (level > settings.debug)
35 return; 35 return;
36 36
37 char msec[20];
38 char buf[20460];
39 char tbuf[20480]; 37 char buf[20480];
40 38
41 struct timeval tv; 39 struct timeval tv;
42 gettimeofday (&tv, 0); 40 gettimeofday (&tv, 0);
43 struct tm *ptime = localtime (&tv.tv_sec); 41 struct tm *ptime = localtime (&tv.tv_sec);
44 42
45 strftime (tbuf, sizeof (tbuf), "%Y-%m-%d %H:%M:%S", ptime); 43 int len = strftime (buf, sizeof (buf) - 7, "%Y-%m-%d %H:%M:%S", ptime);
46 sprintf (msec, ".%03d ", (int)(tv.tv_usec / 1000)); 44 len += sprintf (buf + len, ".%04d ", (int)(tv.tv_usec / 100));
47 45
48 va_list ap; 46 va_list ap;
49 va_start (ap, format); 47 va_start (ap, format);
50 vsnprintf (buf, sizeof (buf), format, ap); 48 len += vsnprintf (buf + len, sizeof (buf) - len, format, ap);
51 va_end (ap); 49 va_end (ap);
52 50
53 strncat (tbuf, msec, sizeof (tbuf)); 51 len = min (sizeof (buf) - 1, len);
54 strncat (tbuf, buf, sizeof (tbuf));
55 52
56 fputs (tbuf, logfile); 53 if (buf [len - 1] != '\n')
54 buf [len++] = '\n'; // not 0-terminated
55
56 write (STDERR_FILENO, buf, len);
57 if (logfile != stderr) 57 if (logfile != stderr)
58 fputs (tbuf, stderr); 58 fwrite (buf, 1, len, logfile);
59 59
60 if (flags & logBacktrace) 60 if (flags & logBacktrace)
61 log_backtrace (tbuf); 61 log_backtrace (buf);
62} 62}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines